diff --git a/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md b/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md index 23d8a1b56a..bfc07096aa 100644 --- a/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md +++ b/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md @@ -15,11 +15,12 @@ Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing- -- [ ] Tested using sandboxing ([nix.useSandbox](https://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](https://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux) - Built on platform(s) - - [ ] NixOS - - [ ] macOS - - [ ] other Linux distributions + - [ ] x86_64-linux + - [ ] aarch64-linux + - [ ] x86_64-darwin + - [ ] aarch64-darwin +- [ ] For non-Linux: Is `sandbox = true` set in `nix.conf`? (See [Nix manual](https://nixos.org/manual/nix/stable/#sec-conf-file)) - [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests)) - [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"` - [ ] Tested execution of all binary files (usually in `./result/bin/`) diff --git a/third_party/nixpkgs/doc/languages-frameworks/index.xml b/third_party/nixpkgs/doc/languages-frameworks/index.xml index 516bddf67f..49cdf94a44 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/index.xml +++ b/third_party/nixpkgs/doc/languages-frameworks/index.xml @@ -20,9 +20,9 @@ + - diff --git a/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md b/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md new file mode 100644 index 0000000000..008424ff45 --- /dev/null +++ b/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md @@ -0,0 +1,203 @@ +# Javascript {#language-javascript} + +## Introduction {#javascript-introduction} + +This contains instructions on how to package javascript applications. For instructions on how to add a cli package from npm please consult the #node.js section + +The various tools available will be listed in the [tools-overview](#javascript-tools-overview). Some general principles for packaging will follow. Finally some tool specific instructions will be given. + +## Tools overview {#javascript-tools-overview} + +## General principles {#javascript-general-principles} + +The following principles are given in order of importance with potential exceptions. + +### Try to use the same node version used upstream {#javascript-upstream-node-version} + +It is often not documented which node version is used upstream, but if it is, try to use the same version when packaging. + +This can be a problem if upstream is using the latest and greatest and you are trying to use an earlier version of node. Some cryptic errors regarding V8 may appear. + +An exception to this: + +### Try to respect the package manager originally used by upstream (and use the upstream lock file) {#javascript-upstream-package-manager} + +A lock file (package-lock.json, yarn.lock...) is supposed to make reproducible installations of node_modules for each tool. + +Guidelines of package managers, recommend to commit those lock files to the repos. If a particular lock file is present, it is a strong indication of which package manager is used upstream. + +It's better to try to use a nix tool that understand the lock file. Using a different tool might give you hard to understand error because different packages have been installed. An example of problems that could arise can be found [here](https://github.com/NixOS/nixpkgs/pull/126629). Upstream uses npm, but this is an attempt to package it with yarn2nix (that uses yarn.lock) + +Using a different tool forces to commit a lock file to the repository. Those files are fairly large, so when packaging for nixpkgs, this approach does not scale well. + +Exceptions to this rule are: + +- when you encounter one of the bugs from a nix tool. In each of the tool specific instructions, known problems will be detailed. If you have a problem with a particular tool, then it's best to try another tool, even if this means you will have to recreate a lock file and commit it to nixpkgs. In general yarn2nix has less known problems and so a simple search in nixpkgs will reveal many yarn.lock files commited +- Some lock files contain particular version of a package that has been pulled off npm for some reason. In that case, you can recreate upstream lock (by removing the original and `npm install`, `yarn`, ...) and commit this to nixpkgs. +- The only tool that supports workspaces (a feature of npm that helps manage sub-directories with different package.json from a single top level package.json) is yarn2nix. If upstream has workspaces you should try yarn2nix. + +### Try to use upstream package.json {#javascript-upstream-package-json} + +Exceptions to this rule are + +- Sometimes the upstream repo assumes some dependencies be installed globally. In that case you can add them manually to the upstream package.json (`yarn add xxx` or `npm install xxx`, ...). Dependencies that are installed locally can be executed with `npx` for cli tools. (e.g. `npx postcss ...`, this is how you can call those dependencies in the phases). +- Sometimes there is a version conflict between some dependency requirements. In that case you can fix a version (by removing the `^`). +- Sometimes the script defined in the package.json does not work as is. Some scripts for example use cli tools that might not be available, or cd in directory with a different package.json (for workspaces notably). In that case, it's perfectly fine to look at what the particular script is doing and break this down in the phases. In the build script you can see `build:*` calling in turns several other build scripts like `build:ui` or `build:server`. If one of those fails, you can try to separate those into: + +```Shell +yarn build:ui +yarn build:server +# OR +npm run build:ui +npm run build:server +``` + +when you need to override a package.json. It's nice to use the one from the upstream src and do some explicit override. Here is an example. + +```nix +patchedPackageJSON = final.runCommand "package.json" { } '' + ${jq}/bin/jq '.version = "0.4.0" | + .devDependencies."@jsdoc/cli" = "^0.2.5" + ${sonar-src}/package.json > $out +''; +``` + +you will still need to commit the modified version of the lock files, but at least the overrides are explicit for everyone to see. + +### Using node_modules directly {#javascript-using-node_modules} + +each tool has an abstraction to just build the node_modules (dependencies) directory. you can always use the stdenv.mkDerivation with the node_modules to build the package (symlink the node_modules directory and then use the package build command). the node_modules abstraction can be also used to build some web framework frontends. For an example of this see how [plausible](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/web-apps/plausible/default.nix) is built. mkYarnModules to make the derivation containing node_modules. Then when building the frontend you can just symlink the node_modules directory + +## javascript packages inside nixpkgs {#javascript-packages-nixpkgs} + +The `pkgs/development/node-packages` folder contains a generated collection of +[NPM packages](https://npmjs.com/) that can be installed with the Nix package +manager. + +As a rule of thumb, the package set should only provide _end user_ software +packages, such as command-line utilities. Libraries should only be added to the +package set if there is a non-NPM package that requires it. + +When it is desired to use NPM libraries in a development project, use the +`node2nix` generator directly on the `package.json` configuration file of the +project. + +The package set provides support for the official stable Node.js versions. +The latest stable LTS release in `nodePackages`, as well as the latest stable +Current release in `nodePackages_latest`. + +If your package uses native addons, you need to examine what kind of native +build system it uses. Here are some examples: + +- `node-gyp` +- `node-gyp-builder` +- `node-pre-gyp` + +After you have identified the correct system, you need to override your package +expression while adding in build system as a build input. For example, `dat` +requires `node-gyp-build`, so [we override](https://github.com/NixOS/nixpkgs/blob/32f5e5da4a1b3f0595527f5195ac3a91451e9b56/pkgs/development/node-packages/default.nix#L37-L40) its expression in [`default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/node-packages/default.nix): + +```nix + dat = super.dat.override { + buildInputs = [ self.node-gyp-build pkgs.libtool pkgs.autoconf pkgs.automake ]; + meta.broken = since "12"; + }; +``` + +To add a package from NPM to nixpkgs: + +1. Modify `pkgs/development/node-packages/node-packages.json` to add, update + or remove package entries to have it included in `nodePackages` and + `nodePackages_latest`. +2. Run the script: `cd pkgs/development/node-packages && ./generate.sh`. +3. Build your new package to test your changes: + `cd /path/to/nixpkgs && nix-build -A nodePackages.`. + To build against the latest stable Current Node.js version (e.g. 14.x): + `nix-build -A nodePackages_latest.` +4. Add and commit all modified and generated files. + +For more information about the generation process, consult the +[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix` +tool. + +## Tool specific instructions {#javascript-tool-specific} + +### node2nix {#javascript-node2nix} + +#### Preparation {#javascript-node2nix-preparation} + +you will need to generate a nix expression for the dependencies + +- don't forget the `-l package-lock.json` if there is a lock file +- Most probably you will need the `--development` to include the `devDependencies` + +so the command will most likely be +`node2nix --developmennt -l package-lock.json` + +[link to the doc in the repo](https://github.com/svanderburg/node2nix) + +#### Pitfalls {#javascript-node2nix-pitfalls} + +- if upstream package.json does not have a "version" attribute, node2nix will crash. You will need to add it like shown in [the package.json section](#javascript-upstream-package-json) +- node2nix has some [bugs](https://github.com/svanderburg/node2nix/issues/238). related to working with lock files from npm distributed with nodejs-16_x +- node2nix does not like missing packages from npm. If you see something like `Cannot resolve version: vue-loader-v16@undefined` then you might want to try another tool. The package might have been pulled off of npm. + +### yarn2nix {#javascript-yarn2nix} + +#### Preparation {#javascript-yarn2nix-preparation} + +you will need at least a yarn.lock and yarn.nix file + +- generate a yarn.lock in upstream if it is not already there +- `yarn2nix > yarn.nix` will generate the dependencies in a nix format + +#### mkYarnPackage {#javascript-yarn2nix-mkYarnPackage} + +this will by default try to generate a binary. For package only generating static assets (Svelte, Vue, React...), you will need to explicitely override the build step with your instructions. It's important to use the `--offline` flag. For example if you script is `"build": "something"` in package.json use + +```nix +buildPhase = '' + yarn build --offline +''; +``` + +The dist phase is also trying to build a binary, the only way to override it is with + +```nix +distPhase = "true"; +``` + +the configure phase can sometimes fail because it tries to be too clever. +One common override is + +```nix +configurePhase = "ln -s $node_modules node_modules"; +``` + +#### mkYarnModules {#javascript-yarn2nix-mkYarnModules} + +this will generate a derivation including the node_modules. If you have to build a derivation for an integrated web framework (rails, phoenix..), this is probably the easiest way. [Plausible](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/web-apps/plausible/default.nix#L39) offers a good example of how to do this. + +#### Pitfalls {#javascript-yarn2nix-pitfalls} + +- if version is missing from upstream package.json, yarn will silently install nothing. In that case, you will need to override package.json as shown in the [package.json section](#javascript-upstream-package-json) + +## Outside of nixpkgs {#javascript-outside-nixpkgs} + +There are some other options available that can't be used inside nixpkgs. Those other options are written in nix. Importing them in nixpkgs will require moving the source code into nixpkgs. Using [Import From Derivation](https://nixos.wiki/wiki/Import_From_Derivation) is not allowed in hydra at present. If you are packaging something outside nixpkgs, those can be considered + +### npmlock2nix {#javascript-npmlock2nix} + +[npmlock2nix](https://github.com/nix-community/npmlock2nix) aims at building node_modules without code generation. It hasn't reached v1 yet, the api might be suject to change. + +#### Pitfalls {#javascript-npmlock2nix-pitfalls} + +- there are some [problems with npm v7](https://github.com/tweag/npmlock2nix/issues/45). + +### nix-npm-buildpackage {#javascript-nix-npm-buildpackage} + +[nix-npm-buildpackage](https://github.com/serokell/nix-npm-buildpackage) aims at building node_modules without code generation. It hasn't reached v1 yet, the api might change. It supports both package-lock.json and yarn.lock. + +#### Pitfalls {#javascript-nix-npm-buildpackage-pitfalls} + +- there are some [problems with npm v7](https://github.com/serokell/nix-npm-buildpackage/issues/33). diff --git a/third_party/nixpkgs/doc/languages-frameworks/node.section.md b/third_party/nixpkgs/doc/languages-frameworks/node.section.md deleted file mode 100644 index e04932a492..0000000000 --- a/third_party/nixpkgs/doc/languages-frameworks/node.section.md +++ /dev/null @@ -1,51 +0,0 @@ -# Node.js {#node.js} - -The `pkgs/development/node-packages` folder contains a generated collection of -[NPM packages](https://npmjs.com/) that can be installed with the Nix package -manager. - -As a rule of thumb, the package set should only provide *end user* software -packages, such as command-line utilities. Libraries should only be added to the -package set if there is a non-NPM package that requires it. - -When it is desired to use NPM libraries in a development project, use the -`node2nix` generator directly on the `package.json` configuration file of the -project. - -The package set provides support for the official stable Node.js versions. -The latest stable LTS release in `nodePackages`, as well as the latest stable -Current release in `nodePackages_latest`. - -If your package uses native addons, you need to examine what kind of native -build system it uses. Here are some examples: - -* `node-gyp` -* `node-gyp-builder` -* `node-pre-gyp` - -After you have identified the correct system, you need to override your package -expression while adding in build system as a build input. For example, `dat` -requires `node-gyp-build`, so [we override](https://github.com/NixOS/nixpkgs/blob/32f5e5da4a1b3f0595527f5195ac3a91451e9b56/pkgs/development/node-packages/default.nix#L37-L40) its expression in [`default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/node-packages/default.nix): - -```nix - dat = super.dat.override { - buildInputs = [ self.node-gyp-build pkgs.libtool pkgs.autoconf pkgs.automake ]; - meta.broken = since "12"; - }; -``` - -To add a package from NPM to nixpkgs: - - 1. Modify `pkgs/development/node-packages/node-packages.json` to add, update - or remove package entries to have it included in `nodePackages` and - `nodePackages_latest`. - 2. Run the script: `cd pkgs/development/node-packages && ./generate.sh`. - 3. Build your new package to test your changes: - `cd /path/to/nixpkgs && nix-build -A nodePackages.`. - To build against the latest stable Current Node.js version (e.g. 14.x): - `nix-build -A nodePackages_latest.` - 4. Add and commit all modified and generated files. - -For more information about the generation process, consult the -[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix` -tool. diff --git a/third_party/nixpkgs/doc/languages-frameworks/perl.section.md b/third_party/nixpkgs/doc/languages-frameworks/perl.section.md index dcb7dcb77b..c992b9d658 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/perl.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/perl.section.md @@ -122,7 +122,7 @@ ImageExifTool = buildPerlPackage { }; buildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optional stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/exiftool ''; }; diff --git a/third_party/nixpkgs/doc/stdenv/meta.chapter.md b/third_party/nixpkgs/doc/stdenv/meta.chapter.md index e4970f7e96..ac518cee52 100644 --- a/third_party/nixpkgs/doc/stdenv/meta.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/meta.chapter.md @@ -114,6 +114,10 @@ For details, see [Licenses](#sec-meta-license). A list of the maintainers of this Nix expression. Maintainers are defined in [`nixpkgs/maintainers/maintainer-list.nix`](https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix). There is no restriction to becoming a maintainer, just add yourself to that list in a separate commit titled “maintainers: add alice”, and reference maintainers with `maintainers = with lib.maintainers; [ alice bob ]`. +### `mainProgram` {#var-meta-mainProgram} + +The name of the main binary for the package. This effects the binary `nix run` executes and falls back to the name of the package. Example: `"rg"` + ### `priority` {#var-meta-priority} The *priority* of the package, used by `nix-env` to resolve file name conflicts between packages. See the Nix manual page for `nix-env` for details. Example: `"10"` (a low-priority package). diff --git a/third_party/nixpkgs/lib/systems/inspect.nix b/third_party/nixpkgs/lib/systems/inspect.nix index 2fba95aa1a..718954e083 100644 --- a/third_party/nixpkgs/lib/systems/inspect.nix +++ b/third_party/nixpkgs/lib/systems/inspect.nix @@ -56,6 +56,7 @@ rec { isNone = { kernel = kernels.none; }; isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ]; + isGnu = with abis; map (a: { abi = a; }) [ gnuabi64 gnu gnueabi gnueabihf ]; isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ]; diff --git a/third_party/nixpkgs/lib/systems/platforms.nix b/third_party/nixpkgs/lib/systems/platforms.nix index d7efe84e2b..2a5f630c3d 100644 --- a/third_party/nixpkgs/lib/systems/platforms.nix +++ b/third_party/nixpkgs/lib/systems/platforms.nix @@ -233,7 +233,7 @@ rec { }; }; - scaleway-c1 = lib.recursiveUpdate armv7l-hf-multiplatform { + scaleway-c1 = armv7l-hf-multiplatform // { gcc = { cpu = "cortex-a9"; fpu = "vfpv3"; diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 9bf862302d..568f00696f 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -3477,6 +3477,12 @@ fingerprint = "2F6C 930F D3C4 7E38 6AFA 4EB4 E23C D2DD 36A4 397F"; }]; }; + fabiangd = { + email = "fabian.g.droege@gmail.com"; + name = "Fabian G. Dröge"; + github = "FabianGD"; + githubId = 40316600; + }; fabianhauser = { email = "fabian.nixos@fh2.ch"; github = "fabianhauser"; @@ -4241,6 +4247,16 @@ githubId = 147689; name = "Hans-Christian Esperer"; }; + hdhog = { + name = "Serg Larchenko"; + email = "hdhog@hdhog.ru"; + github = "hdhog"; + githubId = 386666; + keys = [{ + longkeyid = "rsa496/952EACB76703BA63"; + fingerprint = "A25F 6321 AAB4 4151 4085 9924 952E ACB7 6703 BA63"; + }]; + }; hectorj = { email = "hector.jusforgues+nixos@gmail.com"; github = "hectorj"; @@ -5352,7 +5368,7 @@ }; juaningan = { email = "juaningan@gmail.com"; - github = "juaningan"; + github = "uningan"; githubId = 810075; name = "Juan Rodal"; }; @@ -5662,6 +5678,16 @@ githubId = 148352; name = "Jim Fowler"; }; + kittywitch = { + email = "kat@kittywit.ch"; + github = "kittywitch"; + githubId = 67870215; + name = "kat witch"; + keys = [{ + longkeyid = "rsa4096/0x7248991EFA8EFBEE"; + fingerprint = "01F5 0A29 D4AA 9117 5A11 BDB1 7248 991E FA8E FBEE"; + }]; + }; kiwi = { email = "envy1988@gmail.com"; github = "Kiwi"; @@ -6650,6 +6676,16 @@ githubId = 775189; name = "Jordi Masip"; }; + matdsoupe = { + github = "matdsoupe"; + githubId = 44469426; + name = "Matheus de Souza Pessanha"; + email = "matheus_pessanha2001@outlook.com"; + keys = [{ + longkeyid = "rsa4096/0x2671964AB1E06A08"; + fingerprint = "2F32 CFEF E11A D73B A740 FA47 2671 964A B1E0 6A08"; + }]; + }; matejc = { email = "cotman.matej@gmail.com"; github = "matejc"; @@ -6856,16 +6892,6 @@ fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; }]; }; - mdsp = { - github = "Mdsp9070"; - githubId = 44469426; - name = "Matheus de Souza Pessanha"; - email = "matheus_pessanha2001@outlook.com"; - keys = [{ - longkeyid = "rsa4096/6DFD656220A3B849"; - fingerprint = "2D4D 488F 17FB FF75 664E C016 6DFD 6562 20A3 B849"; - }]; - }; meatcar = { email = "nixpkgs@denys.me"; github = "meatcar"; @@ -11806,6 +11832,12 @@ githubId = 26011724; name = "Burim Augustin Berisa"; }; + yl3dy = { + email = "aleksandr.kiselyov@gmail.com"; + github = "yl3dy"; + githubId = 1311192; + name = "Alexander Kiselyov"; + }; yochai = { email = "yochai@titat.info"; github = "yochai"; @@ -12316,4 +12348,10 @@ github = "zupo"; githubId = 311580; }; + rski = { + name = "rski"; + email = "rom.skiad+nix@gmail.com"; + github = "rski"; + githubId = 2960312; + }; } 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 86031791b1..a138d4c878 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 @@ -182,6 +182,16 @@ + + + + fluidd, a + Klipper web interface for managing 3d printers using + moonraker. Available as + fluidd. + + +
Backward Incompatibilities @@ -273,7 +283,7 @@ Superuser created successfully. The staticjinja package has been upgraded - from 1.0.4 to 3.0.1 + from 1.0.4 to 4.1.0 @@ -779,6 +789,16 @@ Superuser created successfully. group. + + + The fontconfig service’s dpi option has been removed. + Fontconfig should use Xft settings by default so there’s no + need to override one value in multiple places. The user can + set DPI via ~/.Xresources properly, or at the system level per + monitor, or as a last resort at the system level with + services.xserver.dpi. + + The yambar package has been split into @@ -870,6 +890,14 @@ Superuser created successfully. New In Python 3.9 post for more information. + + + qtile hase been updated from + 0.16.0 to 0.18.0, please check + qtile + changelog for changes. + + The claws-mail package now references the 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 231fc05f88..35d65dc43c 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 @@ -56,6 +56,8 @@ pt-services.clipcat.enable). * [navidrome](https://www.navidrome.org/), a personal music streaming server with subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable). +- [fluidd](https://docs.fluidd.xyz/), a Klipper web interface for managing 3d printers using moonraker. Available as [fluidd](#opt-services.fluidd.enable). + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} - The `paperless` module and package have been removed. All users should migrate to the @@ -105,7 +107,7 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable Superuser created successfully. ``` -- The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1 +- The `staticjinja` package has been upgraded from 1.0.4 to 4.1.0 - The `erigon` ethereum node has moved to a new database format in `2021-05-04`, and requires a full resync @@ -223,6 +225,10 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable - The `openrazer` and `openrazer-daemon` packages as well as the `hardware.openrazer` module now require users to be members of the `openrazer` group instead of `plugdev`. With this change, users no longer need be granted the entire set of `plugdev` group permissions, which can include permissions other than those required by `openrazer`. This is desirable from a security point of view. The setting [`harware.openrazer.users`](options.html#opt-services.hardware.openrazer.users) can be used to add users to the `openrazer` group. +- The fontconfig service's dpi option has been removed. + Fontconfig should use Xft settings by default so there's no need to override one value in multiple places. + The user can set DPI via ~/.Xresources properly, or at the system level per monitor, or as a last resort at the system level with `services.xserver.dpi`. + - The `yambar` package has been split into `yambar` and `yambar-wayland`, corresponding to the xorg and wayland backend respectively. Please switch to `yambar-wayland` if you are on wayland. - The `services.minio` module gained an additional option `consoleAddress`, that @@ -250,6 +256,8 @@ To be able to access the web UI this port needs to be opened in the firewall. - `python3` now defaults to Python 3.9. Python 3.9 introduces many deprecation warnings, please look at the [What's New In Python 3.9 post](https://docs.python.org/3/whatsnew/3.9.html) for more information. +- `qtile` hase been updated from '0.16.0' to '0.18.0', please check [qtile changelog](https://github.com/qtile/qtile/blob/master/CHANGELOG) for changes. + - The `claws-mail` package now references the new GTK+ 3 release branch, major version 4. To use the GTK+ 2 releases, one can install the `claws-mail-gtk2` package. - The wordpress module provides a new interface which allows to use different webservers with the new option [`services.wordpress.webserver`](options.html#opt-services.wordpress.webserver). Currently `httpd` and `nginx` are supported. The definitions of wordpress sites should now be set in [`services.wordpress.sites`](options.html#opt-services.wordpress.sites). 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 0372148cb3..f8502188bd 100755 --- a/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py @@ -89,9 +89,7 @@ CHAR_TO_KEY = { ")": "shift-0x0B", } -# Forward references -log: "Logger" -machines: "List[Machine]" +global log, machines, test_script def eprint(*args: object, **kwargs: Any) -> None: @@ -103,7 +101,6 @@ def make_command(args: list) -> str: def create_vlan(vlan_nr: str) -> Tuple[str, str, "subprocess.Popen[bytes]", Any]: - global log log.log("starting VDE switch for network {}".format(vlan_nr)) vde_socket = tempfile.mkdtemp( prefix="nixos-test-vde-", suffix="-vde{}.ctl".format(vlan_nr) @@ -246,6 +243,9 @@ def _perform_ocr_on_screenshot( class Machine: + def __repr__(self) -> str: + return f"" + def __init__(self, args: Dict[str, Any]) -> None: if "name" in args: self.name = args["name"] @@ -910,29 +910,25 @@ class Machine: def create_machine(args: Dict[str, Any]) -> Machine: - global log args["log"] = log return Machine(args) def start_all() -> None: - global machines with log.nested("starting all VMs"): for machine in machines: machine.start() def join_all() -> None: - global machines with log.nested("waiting for all VMs to finish"): for machine in machines: machine.wait_for_shutdown() def run_tests(interactive: bool = False) -> None: - global machines if interactive: - ptpython.repl.embed(globals(), locals()) + ptpython.repl.embed(test_symbols(), {}) else: test_script() # TODO: Collect coverage data @@ -942,12 +938,10 @@ def run_tests(interactive: bool = False) -> None: def serial_stdout_on() -> None: - global log log._print_serial_logs = True def serial_stdout_off() -> None: - global log log._print_serial_logs = False @@ -989,6 +983,39 @@ def subtest(name: str) -> Iterator[None]: return False +def _test_symbols() -> Dict[str, Any]: + general_symbols = dict( + start_all=start_all, + test_script=globals().get("test_script"), # same + machines=globals().get("machines"), # without being initialized + log=globals().get("log"), # extracting those symbol keys + os=os, + create_machine=create_machine, + subtest=subtest, + run_tests=run_tests, + join_all=join_all, + retry=retry, + serial_stdout_off=serial_stdout_off, + serial_stdout_on=serial_stdout_on, + Machine=Machine, # for typing + ) + return general_symbols + + +def test_symbols() -> Dict[str, Any]: + + general_symbols = _test_symbols() + + machine_symbols = {m.name: machines[idx] for idx, m in enumerate(machines)} + print( + "additionally exposed symbols:\n " + + ", ".join(map(lambda m: m.name, machines)) + + ",\n " + + ", ".join(list(general_symbols.keys())) + ) + return {**general_symbols, **machine_symbols} + + if __name__ == "__main__": arg_parser = argparse.ArgumentParser(prog="nixos-test-driver") arg_parser.add_argument( @@ -1028,12 +1055,9 @@ 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(testscript, globals()) + global log, machines, test_script log = Logger() @@ -1062,6 +1086,11 @@ if __name__ == "__main__": process.terminate() log.close() + def test_script() -> None: + with log.nested("running the VM test script"): + symbols = test_symbols() # call eagerly + exec(testscript, symbols, None) + interactive = args.interactive or (not bool(testscript)) tic = time.time() run_tests(interactive) diff --git a/third_party/nixpkgs/nixos/lib/testing-python.nix b/third_party/nixpkgs/nixos/lib/testing-python.nix index e95ebe16ec..43b4f9b159 100644 --- a/third_party/nixpkgs/nixos/lib/testing-python.nix +++ b/third_party/nixpkgs/nixos/lib/testing-python.nix @@ -42,7 +42,9 @@ rec { python < - ${optionalString (cfg.dpi != 0) '' - - - ${toString cfg.dpi} - - - ''} - ''; @@ -237,6 +229,7 @@ in (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") + (mkRemovedOptionModule [ "fonts" "fontconfig" "dpi" ] "Use display server-specific options") ] ++ lib.forEach [ "enable" "substitutions" "preset" ] (opt: lib.mkRemovedOptionModule [ "fonts" "fontconfig" "ultimate" "${opt}" ] '' The fonts.fontconfig.ultimate module and configuration is obsolete. @@ -282,15 +275,6 @@ in ''; }; - dpi = mkOption { - type = types.int; - default = 0; - description = '' - Force DPI setting. Setting to 0 disables DPI - forcing; the DPI detected for the display will be used. - ''; - }; - localConf = mkOption { type = types.lines; default = ""; diff --git a/third_party/nixpkgs/nixos/modules/config/system-environment.nix b/third_party/nixpkgs/nixos/modules/config/system-environment.nix index 4888740ba3..d2a66b8d93 100644 --- a/third_party/nixpkgs/nixos/modules/config/system-environment.nix +++ b/third_party/nixpkgs/nixos/modules/config/system-environment.nix @@ -65,42 +65,40 @@ in }; config = { + environment.etc."pam/environment".text = let + suffixedVariables = + flip mapAttrs cfg.profileRelativeSessionVariables (envVar: suffixes: + flip concatMap cfg.profiles (profile: + map (suffix: "${profile}${suffix}") suffixes + ) + ); - system.build.pamEnvironment = - let - suffixedVariables = - flip mapAttrs cfg.profileRelativeSessionVariables (envVar: suffixes: - flip concatMap cfg.profiles (profile: - map (suffix: "${profile}${suffix}") suffixes - ) - ); + # We're trying to use the same syntax for PAM variables and env variables. + # That means we need to map the env variables that people might use to their + # equivalent PAM variable. + replaceEnvVars = replaceStrings ["$HOME" "$USER"] ["@{HOME}" "@{PAM_USER}"]; - # We're trying to use the same syntax for PAM variables and env variables. - # That means we need to map the env variables that people might use to their - # equivalent PAM variable. - replaceEnvVars = replaceStrings ["$HOME" "$USER"] ["@{HOME}" "@{PAM_USER}"]; + pamVariable = n: v: + ''${n} DEFAULT="${concatStringsSep ":" (map replaceEnvVars (toList v))}"''; - pamVariable = n: v: - ''${n} DEFAULT="${concatStringsSep ":" (map replaceEnvVars (toList v))}"''; - - pamVariables = - concatStringsSep "\n" - (mapAttrsToList pamVariable - (zipAttrsWith (n: concatLists) - [ - # Make sure security wrappers are prioritized without polluting - # shell environments with an extra entry. Sessions which depend on - # pam for its environment will otherwise have eg. broken sudo. In - # particular Gnome Shell sometimes fails to source a proper - # environment from a shell. - { PATH = [ config.security.wrapperDir ]; } - - (mapAttrs (n: toList) cfg.sessionVariables) - suffixedVariables - ])); - in - pkgs.writeText "pam-environment" "${pamVariables}\n"; + pamVariables = + concatStringsSep "\n" + (mapAttrsToList pamVariable + (zipAttrsWith (n: concatLists) + [ + # Make sure security wrappers are prioritized without polluting + # shell environments with an extra entry. Sessions which depend on + # pam for its environment will otherwise have eg. broken sudo. In + # particular Gnome Shell sometimes fails to source a proper + # environment from a shell. + { PATH = [ config.security.wrapperDir ]; } + (mapAttrs (n: toList) cfg.sessionVariables) + suffixedVariables + ])); + in '' + ${pamVariables} + ''; }; } diff --git a/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix b/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix index a4e4fa8d0e..bdf9081674 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix @@ -62,7 +62,7 @@ in { zd1211fw alsa-firmware sof-firmware - openelec-dvb-firmware + libreelec-dvb-firmware ] ++ optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) raspberrypiWirelessFirmware ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ rtl8723bs-firmware diff --git a/third_party/nixpkgs/nixos/modules/hardware/onlykey.udev b/third_party/nixpkgs/nixos/modules/hardware/onlykey.udev deleted file mode 100644 index 6583530e56..0000000000 --- a/third_party/nixpkgs/nixos/modules/hardware/onlykey.udev +++ /dev/null @@ -1,4 +0,0 @@ -ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1" -ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1" -SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", GROUP+="plugdev" -KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", GROUP+="plugdev" diff --git a/third_party/nixpkgs/nixos/modules/hardware/onlykey.nix b/third_party/nixpkgs/nixos/modules/hardware/onlykey/default.nix similarity index 100% rename from third_party/nixpkgs/nixos/modules/hardware/onlykey.nix rename to third_party/nixpkgs/nixos/modules/hardware/onlykey/default.nix diff --git a/third_party/nixpkgs/nixos/modules/hardware/onlykey/onlykey.udev b/third_party/nixpkgs/nixos/modules/hardware/onlykey/onlykey.udev new file mode 100644 index 0000000000..61e3ee4e88 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/hardware/onlykey/onlykey.udev @@ -0,0 +1,18 @@ +# UDEV Rules for OnlyKey, https://docs.crp.to/linux.html +ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="60fc", ENV{ID_MM_DEVICE_IGNORE}="1" +ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="60fc", ENV{MTP_NO_PROBE}="1" +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="60fc", MODE:="0666" +KERNEL=="ttyACM*", ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="60fc", MODE:="0666" + + +# The udev rules were updated upstream without an explanation as you can +# see in [this comment][commit]. Assuming that hey have changed the +# idVendor/idProduct, I've kept the old values. +# TODO: Contact them upstream. +# +# [commit]: https://github.com/trustcrypto/trustcrypto.github.io/commit/0bcf928adaea559e75efa02ebd1040f0a15f611d +# +ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1" +ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1" +SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", GROUP+="plugdev" +KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", GROUP+="plugdev" diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index f26977b124..2473bf2f55 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -72,7 +72,7 @@ ./hardware/tuxedo-keyboard.nix ./hardware/ubertooth.nix ./hardware/usb-wwan.nix - ./hardware/onlykey.nix + ./hardware/onlykey/default.nix ./hardware/opentabletdriver.nix ./hardware/sata.nix ./hardware/wooting.nix @@ -767,6 +767,7 @@ ./services/networking/namecoind.nix ./services/networking/nar-serve.nix ./services/networking/nat.nix + ./services/networking/nats.nix ./services/networking/ndppd.nix ./services/networking/nebula.nix ./services/networking/networkmanager.nix @@ -952,6 +953,7 @@ ./services/web-apps/documize.nix ./services/web-apps/dokuwiki.nix ./services/web-apps/engelsystem.nix + ./services/web-apps/fluidd.nix ./services/web-apps/galene.nix ./services/web-apps/gerrit.nix ./services/web-apps/gotify-server.nix @@ -995,7 +997,7 @@ ./services/web-apps/youtrack.nix ./services/web-apps/zabbix.nix ./services/web-servers/apache-httpd/default.nix - ./services/web-servers/caddy.nix + ./services/web-servers/caddy/default.nix ./services/web-servers/darkhttpd.nix ./services/web-servers/fcgiwrap.nix ./services/web-servers/hitch/default.nix diff --git a/third_party/nixpkgs/nixos/modules/profiles/headless.nix b/third_party/nixpkgs/nixos/modules/profiles/headless.nix index 46a9b6a7d8..c17cb287b7 100644 --- a/third_party/nixpkgs/nixos/modules/profiles/headless.nix +++ b/third_party/nixpkgs/nixos/modules/profiles/headless.nix @@ -9,7 +9,7 @@ with lib; boot.vesa = false; # Don't start a tty on the serial consoles. - systemd.services."serial-getty@ttyS0".enable = false; + systemd.services."serial-getty@ttyS0".enable = lib.mkDefault false; systemd.services."serial-getty@hvc0".enable = false; systemd.services."getty@tty1".enable = false; systemd.services."autovt@".enable = false; diff --git a/third_party/nixpkgs/nixos/modules/security/pam.nix b/third_party/nixpkgs/nixos/modules/security/pam.nix index 5400ba1ef9..163d75d7ca 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam.nix @@ -475,7 +475,7 @@ let # Session management. ${optionalString cfg.setEnvironment '' - session required pam_env.so conffile=${config.system.build.pamEnvironment} readenv=0 + session required pam_env.so conffile=/etc/pam/environment readenv=0 ''} session required pam_unix.so ${optionalString cfg.setLoginUid diff --git a/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix b/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix index 1ccfb35775..bac437c752 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix @@ -467,10 +467,6 @@ in ]; assertions = [ - { - assertion = intersectLists cfg.protocols [ "pop3" "imap" ] != []; - message = "dovecot needs at least one of the IMAP or POP3 listeners enabled"; - } { assertion = (cfg.sslServerCert == null) == (cfg.sslServerKey == null) && (cfg.sslCACert != null -> !(cfg.sslServerCert == null || cfg.sslServerKey == null)); diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nats.nix b/third_party/nixpkgs/nixos/modules/services/networking/nats.nix new file mode 100644 index 0000000000..eb0c65bc65 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/nats.nix @@ -0,0 +1,159 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.nats; + + format = pkgs.formats.json { }; + + configFile = format.generate "nats.conf" cfg.settings; + +in { + + ### Interface + + options = { + services.nats = { + enable = mkEnableOption "NATS messaging system"; + + user = mkOption { + type = types.str; + default = "nats"; + description = "User account under which NATS runs."; + }; + + group = mkOption { + type = types.str; + default = "nats"; + description = "Group under which NATS runs."; + }; + + serverName = mkOption { + default = "nats"; + example = "n1-c3"; + type = types.str; + description = '' + Name of the NATS server, must be unique if clustered. + ''; + }; + + jetstream = mkEnableOption "JetStream"; + + port = mkOption { + default = 4222; + example = 4222; + type = types.port; + description = '' + Port on which to listen. + ''; + }; + + dataDir = mkOption { + default = "/var/lib/nats"; + type = types.path; + description = '' + The NATS data directory. Only used if JetStream is enabled, for + storing stream metadata and messages. + + If left as the default value this directory will automatically be + created before the NATS server starts, otherwise the sysadmin is + responsible for ensuring the directory exists with appropriate + ownership and permissions. + ''; + }; + + settings = mkOption { + default = { }; + type = format.type; + example = literalExample '' + { + jetstream = { + max_mem = "1G"; + max_file = "10G"; + }; + }; + ''; + description = '' + Declarative NATS configuration. See the + + NATS documentation for a list of options. + ''; + }; + }; + }; + + ### Implementation + + config = mkIf cfg.enable { + services.nats.settings = { + server_name = cfg.serverName; + port = cfg.port; + jetstream = optionalAttrs cfg.jetstream { store_dir = cfg.dataDir; }; + }; + + systemd.services.nats = { + description = "NATS messaging system"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = mkMerge [ + (mkIf (cfg.dataDir == "/var/lib/nats") { + StateDirectory = "nats"; + StateDirectoryMode = "0750"; + }) + { + Type = "simple"; + ExecStart = "${pkgs.nats-server}/bin/nats-server -c ${configFile}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + ExecStop = "${pkgs.coreutils}/bin/kill -SIGINT $MAINPID"; + Restart = "on-failure"; + + User = cfg.user; + Group = cfg.group; + + # Hardening + CapabilityBoundingSet = ""; + LimitNOFILE = 800000; # JetStream requires 2 FDs open per stream. + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ReadOnlyPaths = [ ]; + ReadWritePaths = [ cfg.dataDir ]; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; + UMask = "0077"; + } + ]; + }; + + users.users = mkIf (cfg.user == "nats") { + nats = { + description = "NATS daemon user"; + isSystemUser = true; + group = cfg.group; + home = cfg.dataDir; + }; + }; + + users.groups = mkIf (cfg.group == "nats") { nats = { }; }; + }; + +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/v2ray.nix b/third_party/nixpkgs/nixos/modules/services/networking/v2ray.nix index 6a924a1644..0b8b5b56e2 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/v2ray.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/v2ray.nix @@ -25,7 +25,7 @@ with lib; Either configFile or config must be specified. - See . + See . ''; }; @@ -47,7 +47,7 @@ with lib; Either `configFile` or `config` must be specified. - See . + See . ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/deluge.nix b/third_party/nixpkgs/nixos/modules/services/torrent/deluge.nix index 7ca4fdcf64..151a1dd638 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/deluge.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/deluge.nix @@ -149,7 +149,7 @@ in { package = mkOption { type = types.package; - example = literalExample "pkgs.deluge-1_x"; + example = literalExample "pkgs.deluge-2_x"; description = '' Deluge package to use. ''; @@ -184,6 +184,13 @@ in { if versionAtLeast config.system.stateVersion "20.09" then pkgs.deluge-2_x else + # deluge-1_x is no longer packaged and this will resolve to an error + # thanks to the alias for this name. This is left here so that anyone + # using NixOS older than 20.09 receives that error when they upgrade + # and is forced to make an intentional choice to switch to deluge-2_x. + # That might be slightly inconvenient but there is no path to + # downgrade from 2.x to 1.x so NixOS should not automatically perform + # this state migration. pkgs.deluge-1_x ); diff --git a/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix b/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix index 2e71abb69f..bd97a674eb 100644 --- a/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix +++ b/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix @@ -82,7 +82,7 @@ in { auth required pam_unix.so nullok account required pam_unix.so session required pam_unix.so - session required pam_env.so conffile=${config.system.build.pamEnvironment} readenv=0 + session required pam_env.so conffile=/etc/pam/environment readenv=0 session required ${pkgs.systemd}/lib/security/pam_systemd.so ''; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/fluidd.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/fluidd.nix new file mode 100644 index 0000000000..c632b8ff71 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/fluidd.nix @@ -0,0 +1,64 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.fluidd; + moonraker = config.services.moonraker; +in +{ + options.services.fluidd = { + enable = mkEnableOption "Fluidd, a Klipper web interface for managing your 3d printer"; + + package = mkOption { + type = types.package; + description = "Fluidd package to be used in the module"; + default = pkgs.fluidd; + defaultText = "pkgs.fluidd"; + }; + + hostName = mkOption { + type = types.str; + default = "localhost"; + description = "Hostname to serve fluidd on"; + }; + + nginx = mkOption { + type = types.submodule + (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }); + default = { }; + example = { + serverAliases = [ "fluidd.\${config.networking.domain}" ]; + }; + description = "Extra configuration for the nginx virtual host of fluidd."; + }; + }; + + config = mkIf cfg.enable { + services.nginx = { + enable = true; + upstreams.fluidd-apiserver.servers."${moonraker.address}:${toString moonraker.port}" = { }; + virtualHosts."${cfg.hostName}" = mkMerge [ + cfg.nginx + { + root = mkForce "${cfg.package}/share/fluidd/htdocs"; + locations = { + "/" = { + index = "index.html"; + tryFiles = "$uri $uri/ /index.html"; + }; + "/index.html".extraConfig = '' + add_header Cache-Control "no-store, no-cache, must-revalidate"; + ''; + "/websocket" = { + proxyWebsockets = true; + proxyPass = "http://fluidd-apiserver/websocket"; + }; + "~ ^/(printer|api|access|machine|server)/" = { + proxyWebsockets = true; + proxyPass = "http://fluidd-apiserver$request_uri"; + }; + }; + } + ]; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/moodle.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/moodle.nix index ad1e55d62d..c854e084e1 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/moodle.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/moodle.nix @@ -56,7 +56,7 @@ let mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql"; pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql"; - phpExt = pkgs.php.withExtensions + phpExt = pkgs.php74.withExtensions ({ enabled, all }: with all; [ iconv mbstring curl openssl tokenizer xmlrpc soap ctype zip gd simplexml dom intl json sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo filter ]); in { diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix index df7035c03c..17cfdfb244 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -36,11 +36,12 @@ let dependentCertNames = unique (map (hostOpts: hostOpts.certName) acmeEnabledVhosts); mkListenInfo = hostOpts: - if hostOpts.listen != [] then hostOpts.listen - else ( - optional (hostOpts.onlySSL || hostOpts.addSSL || hostOpts.forceSSL) { ip = "*"; port = 443; ssl = true; } ++ - optional (!hostOpts.onlySSL) { ip = "*"; port = 80; ssl = false; } - ); + if hostOpts.listen != [] then + hostOpts.listen + else + optionals (hostOpts.onlySSL || hostOpts.addSSL || hostOpts.forceSSL) (map (addr: { ip = addr; port = 443; ssl = true; }) hostOpts.listenAddresses) ++ + optionals (!hostOpts.onlySSL) (map (addr: { ip = addr; port = 80; ssl = false; }) hostOpts.listenAddresses) + ; listenInfo = unique (concatMap mkListenInfo vhosts); diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix index 394f9a3055..3f732a5c9f 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix @@ -47,12 +47,29 @@ in ]; description = '' Listen addresses and ports for this virtual host. - + + This option overrides addSSL, forceSSL and onlySSL. - + + + If you only want to set the addresses manually and not the ports, take a look at listenAddresses. + + ''; }; + listenAddresses = mkOption { + type = with types; nonEmptyListOf str; + + description = '' + Listen addresses for this virtual host. + Compared to listen this only sets the addreses + and the ports are chosen automatically. + ''; + default = [ "*" ]; + example = [ "127.0.0.1" ]; + }; + enableSSL = mkOption { type = types.bool; visible = false; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix similarity index 84% rename from third_party/nixpkgs/nixos/modules/services/web-servers/caddy.nix rename to third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix index 0a059723cc..fd71020963 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix @@ -4,7 +4,17 @@ with lib; let cfg = config.services.caddy; - configFile = pkgs.writeText "Caddyfile" cfg.config; + vhostToConfig = vhostName: vhostAttrs: '' + ${vhostName} ${builtins.concatStringsSep " " vhostAttrs.serverAliases} { + ${vhostAttrs.extraConfig} + } + ''; + configFile = pkgs.writeText "Caddyfile" (builtins.concatStringsSep "\n" + ([ cfg.config ] ++ (mapAttrsToList vhostToConfig cfg.virtualHosts))); + + formattedConfig = pkgs.runCommand "formattedCaddyFile" { } '' + ${cfg.package}/bin/caddy fmt ${configFile} > $out + ''; tlsConfig = { apps.tls.automation.policies = [{ @@ -17,7 +27,7 @@ let adaptedConfig = pkgs.runCommand "caddy-config-adapted.json" { } '' ${cfg.package}/bin/caddy adapt \ - --config ${configFile} --adapter ${cfg.adapter} > $out + --config ${formattedConfig} --adapter ${cfg.adapter} > $out ''; tlsJSON = pkgs.writeText "tls.json" (builtins.toJSON tlsConfig); @@ -68,6 +78,27 @@ in ''; }; + virtualHosts = mkOption { + type = types.attrsOf (types.submodule (import ./vhost-options.nix { + inherit config lib; + })); + default = { }; + example = literalExample '' + { + "hydra.example.com" = { + serverAliases = [ "www.hydra.example.com" ]; + extraConfig = '''''' + encode gzip + log + root /srv/http + ''''''; + }; + }; + ''; + description = "Declarative vhost config"; + }; + + user = mkOption { default = "caddy"; type = types.str; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/vhost-options.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/vhost-options.nix new file mode 100644 index 0000000000..1f74295fc9 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/vhost-options.nix @@ -0,0 +1,28 @@ +# This file defines the options that can be used both for the Nginx +# main server configuration, and for the virtual hosts. (The latter +# has additional options that affect the web server as a whole, like +# the user/group to run under.) + +{ lib, ... }: + +with lib; +{ + options = { + serverAliases = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "www.example.org" "example.org" ]; + description = '' + Additional names of virtual hosts served by this virtual host configuration. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + These lines go into the vhost verbatim + ''; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix index e04fcdaf41..584dfb63c4 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix @@ -18,7 +18,6 @@ let fontconfig = config.fonts.fontconfig; xresourcesXft = pkgs.writeText "Xresources-Xft" '' - ${optionalString (fontconfig.dpi != 0) ''Xft.dpi: ${toString fontconfig.dpi}''} Xft.antialias: ${if fontconfig.antialias then "1" else "0"} Xft.rgba: ${fontconfig.subpixel.rgba} Xft.lcdfilter: lcd${fontconfig.subpixel.lcdfilter} diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix index 0f7941364d..5c4c6c67fd 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix @@ -314,7 +314,7 @@ in password required pam_deny.so session required pam_succeed_if.so audit quiet_success user = gdm - session required pam_env.so conffile=${config.system.build.pamEnvironment} readenv=0 + session required pam_env.so conffile=/etc/pam/environment readenv=0 session optional ${pkgs.systemd}/lib/security/pam_systemd.so session optional pam_keyinit.so force revoke session optional pam_permit.so diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix index 945222296f..41c1b635f5 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix @@ -284,7 +284,7 @@ in password required pam_deny.so session required pam_succeed_if.so audit quiet_success user = lightdm - session required pam_env.so conffile=${config.system.build.pamEnvironment} readenv=0 + session required pam_env.so conffile=/etc/pam/environment readenv=0 session optional ${pkgs.systemd}/lib/security/pam_systemd.so session optional pam_keyinit.so force revoke session optional pam_permit.so diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix index 116994db1c..d79b3cda2f 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix @@ -229,7 +229,7 @@ in password required pam_deny.so session required pam_succeed_if.so audit quiet_success user = sddm - session required pam_env.so conffile=${config.system.build.pamEnvironment} readenv=0 + session required pam_env.so conffile=/etc/pam/environment readenv=0 session optional ${pkgs.systemd}/lib/security/pam_systemd.so session optional pam_keyinit.so force revoke session optional pam_permit.so diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/qtile.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/qtile.nix index cadc316bbc..835b41d4ad 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/qtile.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/qtile.nix @@ -15,7 +15,7 @@ in services.xserver.windowManager.session = [{ name = "qtile"; start = '' - ${pkgs.qtile}/bin/qtile & + ${pkgs.qtile}/bin/qtile start & waitPID=$! ''; }]; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix index 7316f6fcfe..ad9bd88f98 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix @@ -297,7 +297,11 @@ in dpi = mkOption { type = types.nullOr types.int; default = null; - description = "DPI resolution to use for X server."; + description = '' + Force global DPI resolution to use for X server. It's recommended to + use this only when DPI is detected incorrectly; also consider using + Monitor section in configuration file instead. + ''; }; updateDbusEnvironment = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl b/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl index 8bd8546547..dd391c8b5d 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl +++ b/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl @@ -243,9 +243,13 @@ while (my ($unit, $state) = each %{$activePrev}) { foreach my $socket (@sockets) { if (defined $activePrev->{$socket}) { $unitsToStop{$socket} = 1; - $unitsToStart{$socket} = 1; - recordUnit($startListFile, $socket); - $socketActivated = 1; + # Only restart sockets that actually + # exist in new configuration: + if (-e "$out/etc/systemd/system/$socket") { + $unitsToStart{$socket} = 1; + recordUnit($startListFile, $socket); + $socketActivated = 1; + } } } } diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix index b53cb9e7d4..934c57f839 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -70,7 +70,10 @@ let # Journal. "systemd-journald.socket" + "systemd-journald@.socket" + "systemd-journald-varlink@.socket" "systemd-journald.service" + "systemd-journald@.service" "systemd-journal-flush.service" "systemd-journal-catalog-update.service" ] ++ (optional (!config.boot.isContainer) "systemd-journald-audit.socket") ++ [ @@ -1181,6 +1184,8 @@ in systemd.services."user-runtime-dir@".restartIfChanged = false; systemd.services.systemd-journald.restartTriggers = [ config.environment.etc."systemd/journald.conf".source ]; systemd.services.systemd-journald.stopIfChanged = false; + systemd.services."systemd-journald@".restartTriggers = [ config.environment.etc."systemd/journald.conf".source ]; + systemd.services."systemd-journald@".stopIfChanged = false; systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/amazon-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/amazon-image.nix index 26297a7d0f..bf5c04543a 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/amazon-image.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/amazon-image.nix @@ -18,7 +18,15 @@ let in { - imports = [ ../profiles/headless.nix ./ec2-data.nix ./amazon-init.nix ]; + imports = [ + ../profiles/headless.nix + # Note: While we do use the headless profile, we also explicitly + # turn on the serial console on ttyS0 below. This is because + # AWS does support accessing the serial console: + # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configure-access-to-serial-console.html + ./ec2-data.nix + ./amazon-init.nix + ]; config = { @@ -49,7 +57,7 @@ in ]; boot.initrd.kernelModules = [ "xen-blkfront" "xen-netfront" ]; boot.initrd.availableKernelModules = [ "ixgbevf" "ena" "nvme" ]; - boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0" "random.trust_cpu=on" ]; + boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0,115200n8" "random.trust_cpu=on" ]; # Prevent the nouveau kernel module from being loaded, as it # interferes with the nvidia/nvidia-uvm modules needed for CUDA. @@ -63,7 +71,12 @@ in boot.loader.grub.extraPerEntryConfig = mkIf (!cfg.hvm) "root (hd0)"; boot.loader.grub.efiSupport = cfg.efi; boot.loader.grub.efiInstallAsRemovable = cfg.efi; - boot.loader.timeout = 0; + boot.loader.timeout = 1; + boot.loader.grub.extraConfig = '' + serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1 + terminal_output console serial + terminal_input console serial + ''; boot.initrd.network.enable = true; @@ -127,15 +140,14 @@ in copy_bin_and_libs ${pkgs.util-linux}/sbin/swapon ''; - # Don't put old configurations in the GRUB menu. The user has no - # way to select them anyway. - boot.loader.grub.configurationLimit = 0; - # Allow root logins only using the SSH key that the user specified # at instance creation time. services.openssh.enable = true; services.openssh.permitRootLogin = "prohibit-password"; + # Enable the serial console on ttyS0 + systemd.services."serial-getty@ttyS0".enable = true; + # Creates symlinks for block device names. services.udev.packages = [ pkgs.ec2-utils ]; diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index e1ad011b22..314c031bb3 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -136,6 +136,7 @@ in fish = handleTest ./fish.nix {}; flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {}; fluentd = handleTest ./fluentd.nix {}; + fluidd = handleTest ./fluidd.nix {}; fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {}; freeswitch = handleTest ./freeswitch.nix {}; fsck = handleTest ./fsck.nix {}; @@ -283,6 +284,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; }; + nats = handleTest ./nats.nix {}; navidrome = handleTest ./navidrome.nix {}; ncdns = handleTest ./ncdns.nix {}; ndppd = handleTest ./ndppd.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/caddy.nix b/third_party/nixpkgs/nixos/tests/caddy.nix index 063f83a2f3..29b227c040 100644 --- a/third_party/nixpkgs/nixos/tests/caddy.nix +++ b/third_party/nixpkgs/nixos/tests/caddy.nix @@ -43,49 +43,64 @@ import ./make-test-python.nix ({ pkgs, ... }: { } ''; }; + specialisation.multiple-configs.configuration = { + services.caddy.virtualHosts = { + "http://localhost:8080" = { }; + "http://localhost:8081" = { }; + }; + }; }; - }; - testScript = { nodes, ... }: let - etagSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/etag"; - justReloadSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/config-reload"; - in '' - url = "http://localhost/example.html" - webserver.wait_for_unit("caddy") - webserver.wait_for_open_port("80") + testScript = { nodes, ... }: + let + etagSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/etag"; + justReloadSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/config-reload"; + multipleConfigs = "${nodes.webserver.config.system.build.toplevel}/specialisation/multiple-configs"; + in + '' + url = "http://localhost/example.html" + webserver.wait_for_unit("caddy") + webserver.wait_for_open_port("80") - def check_etag(url): - etag = webserver.succeed( - "curl --fail -v '{}' 2>&1 | sed -n -e \"s/^< [Ee][Tt][Aa][Gg]: *//p\"".format( - url + def check_etag(url): + etag = webserver.succeed( + "curl --fail -v '{}' 2>&1 | sed -n -e \"s/^< [Ee][Tt][Aa][Gg]: *//p\"".format( + url + ) ) - ) - etag = etag.replace("\r\n", " ") - http_code = webserver.succeed( - "curl --fail --silent --show-error -o /dev/null -w \"%{{http_code}}\" --head -H 'If-None-Match: {}' {}".format( - etag, url + etag = etag.replace("\r\n", " ") + http_code = webserver.succeed( + "curl --fail --silent --show-error -o /dev/null -w \"%{{http_code}}\" --head -H 'If-None-Match: {}' {}".format( + etag, url + ) ) - ) - assert int(http_code) == 304, "HTTP code is {}, expected 304".format(http_code) - return etag + assert int(http_code) == 304, "HTTP code is {}, expected 304".format(http_code) + return etag - with subtest("check ETag if serving Nix store paths"): - old_etag = check_etag(url) - webserver.succeed( - "${etagSystem}/bin/switch-to-configuration test >&2" - ) - webserver.sleep(1) - new_etag = check_etag(url) - assert old_etag != new_etag, "Old ETag {} is the same as {}".format( - old_etag, new_etag - ) + with subtest("check ETag if serving Nix store paths"): + old_etag = check_etag(url) + webserver.succeed( + "${etagSystem}/bin/switch-to-configuration test >&2" + ) + webserver.sleep(1) + new_etag = check_etag(url) + assert old_etag != new_etag, "Old ETag {} is the same as {}".format( + old_etag, new_etag + ) - with subtest("config is reloaded on nixos-rebuild switch"): - webserver.succeed( - "${justReloadSystem}/bin/switch-to-configuration test >&2" - ) - webserver.wait_for_open_port("8080") - ''; -}) + with subtest("config is reloaded on nixos-rebuild switch"): + webserver.succeed( + "${justReloadSystem}/bin/switch-to-configuration test >&2" + ) + webserver.wait_for_open_port("8080") + + with subtest("multiple configs are correctly merged"): + webserver.succeed( + "${multipleConfigs}/bin/switch-to-configuration test >&2" + ) + webserver.wait_for_open_port("8080") + webserver.wait_for_open_port("8081") + ''; + }) diff --git a/third_party/nixpkgs/nixos/tests/common/ec2.nix b/third_party/nixpkgs/nixos/tests/common/ec2.nix index 52d0310ac7..64b0a91ac1 100644 --- a/third_party/nixpkgs/nixos/tests/common/ec2.nix +++ b/third_party/nixpkgs/nixos/tests/common/ec2.nix @@ -23,6 +23,7 @@ with pkgs.lib; testScript = '' import os import subprocess + import tempfile image_dir = os.path.join( os.environ.get("TMPDIR", tempfile.gettempdir()), "tmp", "vm-state-machine" diff --git a/third_party/nixpkgs/nixos/tests/deluge.nix b/third_party/nixpkgs/nixos/tests/deluge.nix index 300bc0a115..f673ec2db5 100644 --- a/third_party/nixpkgs/nixos/tests/deluge.nix +++ b/third_party/nixpkgs/nixos/tests/deluge.nix @@ -5,41 +5,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; nodes = { - simple1 = { - services.deluge = { - enable = true; - package = pkgs.deluge-1_x; - web = { - enable = true; - openFirewall = true; - }; - }; - }; - - declarative1 = { - services.deluge = { - enable = true; - package = pkgs.deluge-1_x; - openFirewall = true; - declarative = true; - config = { - allow_remote = true; - download_location = "/var/lib/deluge/my-download"; - daemon_port = 58846; - listen_ports = [ 6881 6889 ]; - }; - web = { - enable = true; - port = 3142; - }; - authFile = pkgs.writeText "deluge-auth" '' - localclient:a7bef72a890:10 - andrew:password:10 - user3:anotherpass:5 - ''; - }; - }; - simple2 = { services.deluge = { enable = true; diff --git a/third_party/nixpkgs/nixos/tests/fluidd.nix b/third_party/nixpkgs/nixos/tests/fluidd.nix new file mode 100644 index 0000000000..f49a4110d7 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/fluidd.nix @@ -0,0 +1,21 @@ +import ./make-test-python.nix ({ lib, ... }: + +with lib; + +{ + name = "fluidd"; + meta.maintainers = with maintainers; [ vtuan10 ]; + + nodes.machine = { pkgs, ... }: { + services.fluidd = { + enable = true; + }; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("nginx.service") + machine.wait_for_open_port(80) + machine.succeed("curl -sSfL http://localhost/ | grep 'fluidd'") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/nats.nix b/third_party/nixpkgs/nixos/tests/nats.nix new file mode 100644 index 0000000000..bee36f262f --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/nats.nix @@ -0,0 +1,65 @@ +let + + port = 4222; + username = "client"; + password = "password"; + topic = "foo.bar"; + +in import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "nats"; + meta = with pkgs.lib; { maintainers = with maintainers; [ c0deaddict ]; }; + + nodes = let + client = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ natscli ]; + }; + in { + server = { pkgs, ... }: { + networking.firewall.allowedTCPPorts = [ port ]; + services.nats = { + inherit port; + enable = true; + settings = { + authorization = { + users = [{ + user = username; + inherit password; + }]; + }; + }; + }; + }; + + client1 = client; + client2 = client; + }; + + testScript = let file = "/tmp/msg"; + in '' + def nats_cmd(*args): + return ( + "nats " + "--server=nats://server:${toString port} " + "--user=${username} " + "--password=${password} " + "{}" + ).format(" ".join(args)) + + start_all() + server.wait_for_unit("nats.service") + + client1.fail("test -f ${file}") + + # Subscribe on topic on client1 and echo messages to file. + client1.execute("({} | tee ${file} &)".format(nats_cmd("sub", "--raw", "${topic}"))) + + # Give client1 some time to subscribe. + client1.execute("sleep 2") + + # Publish message on client2. + client2.execute(nats_cmd("pub", "${topic}", "hello")) + + # Check if message has been received. + client1.succeed("grep -q hello ${file}") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/nsd.nix b/third_party/nixpkgs/nixos/tests/nsd.nix index 7387f4f1df..eea5a82f6f 100644 --- a/third_party/nixpkgs/nixos/tests/nsd.nix +++ b/third_party/nixpkgs/nixos/tests/nsd.nix @@ -85,6 +85,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { self = clientv4 if type == 4 else clientv6 out = self.succeed(f"host -{type} -t {rr} {query}").rstrip() self.log(f"output: {out}") + import re assert re.search( expected, out ), f"DNS IPv{type} query on {query} gave '{out}' instead of '{expected}'" diff --git a/third_party/nixpkgs/nixos/tests/postgresql.nix b/third_party/nixpkgs/nixos/tests/postgresql.nix index 4e5f921696..2b487c20a6 100644 --- a/third_party/nixpkgs/nixos/tests/postgresql.nix +++ b/third_party/nixpkgs/nixos/tests/postgresql.nix @@ -61,6 +61,7 @@ let with subtest("Postgresql survives restart (bug #1735)"): machine.shutdown() + import time time.sleep(2) machine.start() machine.wait_for_unit("postgresql") diff --git a/third_party/nixpkgs/nixos/tests/shattered-pixel-dungeon.nix b/third_party/nixpkgs/nixos/tests/shattered-pixel-dungeon.nix index cf6ee8db80..d8c4b44819 100644 --- a/third_party/nixpkgs/nixos/tests/shattered-pixel-dungeon.nix +++ b/third_party/nixpkgs/nixos/tests/shattered-pixel-dungeon.nix @@ -10,6 +10,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { ]; services.xserver.enable = true; + sound.enable = true; environment.systemPackages = [ pkgs.shattered-pixel-dungeon ]; }; diff --git a/third_party/nixpkgs/nixos/tests/turbovnc-headless-server.nix b/third_party/nixpkgs/nixos/tests/turbovnc-headless-server.nix index 35da9a53d2..dfa17d65f8 100644 --- a/third_party/nixpkgs/nixos/tests/turbovnc-headless-server.nix +++ b/third_party/nixpkgs/nixos/tests/turbovnc-headless-server.nix @@ -57,6 +57,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { else: if check_success(): return + import time time.sleep(retry_sleep) if not check_success(): diff --git a/third_party/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix b/third_party/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix index f55cee957c..6f827cea95 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.20.2"; + version = "2.30.5"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "1mm93ba26b7q69hvabzalg30dh8pl858nj4m2bb57pznnp09lq9a"; + sha256 = "sha256-hfpMeUhv6FC9lnPCfdWnAFCaKiteplyrS/o3Lf7cQY4="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix index 93f62e23f3..ed68769f66 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix @@ -1,12 +1,14 @@ -{ lib, fetchurl, pythonPackages, mopidy }: +{ lib, fetchFromGitHub, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; version = "4.1.1"; - src = fetchurl { - url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz"; - sha256 = "0054gqvnx3brpfxr06dcby0z0dirwv9ydi6gj5iz0cxn0fbi6gv2"; + src = fetchFromGitHub { + owner = "mopidy"; + repo = "mopidy-spotify"; + rev = "v${version}"; + sha256 = "1qsac2yy26cdlsmxd523v8ayacs0s6jj9x79sngwap781i63zqrm"; }; propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; @@ -17,7 +19,7 @@ pythonPackages.buildPythonApplication rec { homepage = "https://www.mopidy.com/"; description = "Mopidy extension for playing music from Spotify"; license = licenses.asl20; - maintainers = []; - hydraPlatforms = []; + maintainers = with maintainers; [ rski ]; + hydraPlatforms = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix index 44788467d8..6f55a82e13 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix @@ -1,30 +1,52 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , makeWrapper -, alsa-lib +, pkg-config , perl -, withConplay ? !stdenv.targetPlatform.isWindows +, withAlsa ? stdenv.hostPlatform.isLinux +, alsa-lib +, withPulse ? stdenv.hostPlatform.isLinux +, libpulseaudio +, withCoreAudio ? stdenv.hostPlatform.isDarwin +, AudioUnit +, AudioToolbox +, withJack ? stdenv.hostPlatform.isUnix +, jack +, withConplay ? !stdenv.hostPlatform.isWindows }: stdenv.mkDerivation rec { pname = "mpg123"; - version = "1.26.5"; + version = "1.28.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-UCqX4Nk1vn432YczgCHY8wG641wohPKoPVnEtSRm7wY="; + sha256 = "006v44nz4nkpgvxz1k2vbbrfpa2m47hyydscs0wf3iysiyvd9vvy"; }; outputs = [ "out" ] ++ lib.optionals withConplay [ "conplay" ]; - nativeBuildInputs = lib.optionals withConplay [ makeWrapper ]; + nativeBuildInputs = lib.optionals withConplay [ makeWrapper ] + ++ lib.optionals (withPulse || withJack) [ pkg-config ]; buildInputs = lib.optionals withConplay [ perl ] - ++ lib.optionals (!stdenv.isDarwin && !stdenv.targetPlatform.isWindows) [ alsa-lib ]; + ++ lib.optionals withAlsa [ alsa-lib ] + ++ lib.optionals withPulse [ libpulseaudio ] + ++ lib.optionals withCoreAudio [ AudioUnit AudioToolbox ] + ++ lib.optionals withJack [ jack ]; - configureFlags = lib.optional - (stdenv.hostPlatform ? mpg123) - "--with-cpu=${stdenv.hostPlatform.mpg123.cpu}"; + configureFlags = [ + "--with-audio=${lib.strings.concatStringsSep "," ( + lib.optional withJack "jack" + ++ lib.optional withPulse "pulse" + ++ lib.optional withAlsa "alsa" + ++ lib.optional withCoreAudio "coreaudio" + ++ [ "dummy" ] + )}" + ] ++ lib.optional (stdenv.hostPlatform ? mpg123) "--with-cpu=${stdenv.hostPlatform.mpg123.cpu}"; + + enableParallelBuilding = true; postInstall = lib.optionalString withConplay '' mkdir -p $conplay/bin @@ -43,8 +65,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast console MPEG Audio Player and decoder library"; homepage = "https://mpg123.org"; - license = licenses.lgpl21; - maintainers = [ maintainers.ftrvxmtrx ]; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ ftrvxmtrx ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix index 66a14fa05b..83456dcb7c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.1.50"; + version = "6.1.51"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "11cw4292pml71hdnfy8y91blwyh45dyam1ywr09355zk44c5njpq"; + sha256 = "sha256-4goZRNKNFrfKRbGODJMhN6DyOh8U3+nWRDF1VMT7I1E="; }; configurePhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix index b27593626e..18bd8170f1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "sidplayfp"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; rev = "v${version}"; - sha256 = "sha256-hN7225lhuYyo4wPDiiEc9FaPg90pZ13mLw93V8tb/P0="; + sha256 = "sha256-IlPZmZpWxMaArkRnqu6JCGxiHU7JczRxiySqzAopfxc="; }; nativeBuildInputs = [ autoreconfHook perl pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix index 629cc4bd11..70acbd4c31 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "spotify-qt"; - version = "3.6"; + version = "3.7"; src = fetchFromGitHub { owner = "kraxarn"; repo = pname; rev = "v${version}"; - sha256 = "mKHyE6ZffMYYRLMpzMX53chyJyWxhTAaGvtBI3l6wkI="; + sha256 = "sha256-oRrgZtSDebbUVPc+hxE9GJ2n1AmGvZt/2aWrBMmRtNA="; }; buildInputs = [ libxcb qtbase qtsvg ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/tagutil/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tagutil/default.nix new file mode 100644 index 0000000000..802cd00087 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/tagutil/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, fetchFromGitHub +, pkg-config, cmake, libyaml +, jansson, libvorbis, taglib +, zlib +}: + +stdenv.mkDerivation rec { + pname = "tagutil"; + version = "3.1"; + + src = fetchFromGitHub { + owner = "kaworu"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-oY1aGl5CKVtpOfh8Wskio/huWYMiPuxWPqxlooTutcw="; + }; + + sourceRoot = "source/src"; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + libvorbis + libyaml + jansson + taglib + zlib + ]; + + meta = with lib; { + description = "Scriptable music files tags tool and editor"; + homepage = "https://github.com/kaworu/tagutil"; + license = licenses.bsd2; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix b/third_party/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix index 986e3215b9..4b3cbb171b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { # When building with zest GUI, patch plugins # and standalone executable to properly locate zest - postFixup = lib.optional (guiModule == "zest") '' + postFixup = lib.optionalString (guiModule == "zest") '' patchelf --set-rpath "${mruby-zest}:$(patchelf --print-rpath "$out/lib/lv2/ZynAddSubFX.lv2/ZynAddSubFX_ui.so")" \ "$out/lib/lv2/ZynAddSubFX.lv2/ZynAddSubFX_ui.so" diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix index 715de18a8f..16bcc71653 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -8,63 +8,50 @@ , openjdk11 , dpkg , writeScript -, coreutils , bash , tor -, psmisc +, gnutar +, zip +, xz }: let bisq-launcher = writeScript "bisq-launcher" '' #! ${bash}/bin/bash - # Setup a temporary Tor instance - TMPDIR=$(${coreutils}/bin/mktemp -d) - CONTROLPORT=$(${coreutils}/bin/shuf -i 9100-9499 -n 1) - SOCKSPORT=$(${coreutils}/bin/shuf -i 9500-9999 -n 1) - ${coreutils}/bin/head -c 1024 < /dev/urandom > $TMPDIR/cookie + # This is just a comment to convince Nix that Tor is a + # runtime dependency; The Tor binary is in a *.jar file, + # whereas Nix only scans for hashes in uncompressed text. + # ${bisq-tor} - ${tor}/bin/tor --SocksPort $SOCKSPORT --ControlPort $CONTROLPORT \ - --ControlPortWriteToFile $TMPDIR/port --CookieAuthFile $TMPDIR/cookie \ - --CookieAuthentication 1 >$TMPDIR/tor.log --RunAsDaemon 1 + JAVA_TOOL_OPTIONS="-XX:+UseG1GC -XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:+UseStringDeduplication" bisq-desktop-wrapped "$@" + ''; - torpid=$(${psmisc}/bin/fuser $CONTROLPORT/tcp) + bisq-tor = writeScript "bisq-tor" '' + #! ${bash}/bin/bash - echo Temp directory: $TMPDIR - echo Tor PID: $torpid - echo Tor control port: $CONTROLPORT - echo Tor SOCKS port: $SOCKSPORT - echo Tor log: $TMPDIR/tor.log - echo Bisq log file: $TMPDIR/bisq.log - - JAVA_TOOL_OPTIONS="-XX:MaxRAM=4g" bisq-desktop-wrapped \ - --torControlCookieFile=$TMPDIR/cookie \ - --torControlUseSafeCookieAuth \ - --torControlPort $CONTROLPORT "$@" > $TMPDIR/bisq.log - - echo Bisq exited. Killing Tor... - kill $torpid + exec ${tor}/bin/tor "$@" ''; in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.7.0"; + version = "1.7.2"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "0crry5k7crmrqn14wxiyrnhk09ac8a9ksqrwwky7jsnyah0bx5k4"; + sha256 = "0b2rh9sphc9wffkawprrl20frgv0rah7y2k5sfxpjc3shgkqsw80"; }; - nativeBuildInputs = [ makeWrapper copyDesktopItems dpkg ]; + nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg gnutar zip xz ]; desktopItems = [ (makeDesktopItem { name = "Bisq"; exec = "bisq-desktop"; icon = "bisq"; - desktopName = "Bisq"; + desktopName = "Bisq ${version}"; genericName = "Decentralized bitcoin exchange"; - categories = "Network;Utility;"; + categories = "Network;P2P;"; }) ]; @@ -72,6 +59,16 @@ stdenv.mkDerivation rec { dpkg -x $src . ''; + buildPhase = '' + # Replace the embedded Tor binary (which is in a Tar archive) + # with one from Nixpkgs. + + mkdir -p native/linux/x64/ + cp ${bisq-tor} ./tor + tar -cJf native/linux/x64/tor.tar.xz tor + zip -r opt/bisq/lib/app/desktop-${version}-all.jar native + ''; + installPhase = '' runHook preInstall @@ -86,13 +83,15 @@ stdenv.mkDerivation rec { for n in 16 24 32 48 64 96 128 256; do size=$n"x"$n - ${imagemagick}/bin/convert opt/bisq/lib/Bisq.png -resize $size bisq.png + convert opt/bisq/lib/Bisq.png -resize $size bisq.png install -Dm644 -t $out/share/icons/hicolor/$size/apps bisq.png done; runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "A decentralized bitcoin exchange network"; homepage = "https://bisq.network"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/update.sh b/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/update.sh new file mode 100755 index 0000000000..393447834b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/update.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq gnused gnupg common-updater-scripts + +set -eu -o pipefail + +version="$(curl -s https://api.github.com/repos/bisq-network/bisq/releases| jq '.[] | {name,prerelease} | select(.prerelease==false) | limit(1;.[])' | sed 's/[\"v]//g' | head -n 1)" +depname="Bisq-64bit-$version.deb" +src="https://github.com/bisq-network/bisq/releases/download/v$version/$depname" +signature="$src.asc" +key="CB36 D7D2 EBB2 E35D 9B75 500B CD5D C1C5 29CD FD3B" + +pushd $(mktemp -d --suffix=-bisq-updater) +export GNUPGHOME=$PWD/gnupg +mkdir -m 700 -p "$GNUPGHOME" +curl -L -o "$depname" -- "$src" +curl -L -o signature.asc -- "$signature" +gpg --batch --recv-keys "$key" +gpg --batch --verify signature.asc "$depname" +sha256=$(nix-prefetch-url --type sha256 "file://$PWD/$depname") +popd + +update-source-version bisq-desktop "$version" "$sha256" diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix index 00727d294d..8bbeda2e0d 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ++ optionals withWallet [ db48 sqlite ] ++ optionals withGui [ qrencode qtbase qttools ]; - postInstall = optional withGui '' + postInstall = optionalString withGui '' install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop substituteInPlace $out/share/applications/bitcoin-qt.desktop --replace "Icon=bitcoin128" "Icon=bitcoin" install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix index 08eeac760c..4426839462 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "21.1.29"; + version = "21.5.25"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "sha256-Qdiyjutzt8r1tIfcW7/AtSuOpf1Un5TeHoeZx5uQthM="; + sha256 = "sha256-2EIElhQGA0UprPF2pdIfYM9SWYIteD+kH+rupjxCiz4="; }; sourceRoot = "."; 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 f087741254..8257aa43dd 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix @@ -55,6 +55,6 @@ in buildGoModule rec { homepage = "https://geth.ethereum.org/"; description = "Official golang implementation of the Ethereum protocol"; license = with licenses; [ lgpl3Plus gpl3Plus ]; - maintainers = with maintainers; [ adisbladis lionello xrelkd RaghavSood ]; + maintainers = with maintainers; [ adisbladis lionello RaghavSood ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix index be2373941b..39f35f211f 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { description = "Fast, light, robust Ethereum implementation"; homepage = "http://parity.io/ethereum"; license = licenses.gpl3; - maintainers = with maintainers; [ akru xrelkd ]; + maintainers = with maintainers; [ akru ]; platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix index a1f0b17b20..b2fc34ca57 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-5PNogoahAZUjIlQsVXwm7j5OmP3/uEEdV0vrIDXXBx8="; + sha256 = "sha256-GsGa2y718qWQlP0pLy8X3mVsFpNNnOTVQZpp4+e1RhA="; }; - cargoSha256 = "0iikys90flzmnnb6l2wzag8mp91p6z9y7rjzym2sd6m7xhgbc1x6"; + cargoSha256 = "03lnw61pgp88iwz2gbcp8y3jvz6v94cn0ynjz6snb9jq88gf25dz"; nativeBuildInputs = [ clang ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix index cc3f898a29..8062d26b28 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix @@ -1,4 +1,4 @@ -{ channel, pname, version, build ? null, sha256Hash }: +{ channel, pname, version, sha256Hash }: { alsa-lib , bash @@ -55,7 +55,7 @@ let drvName = "android-studio-${channel}-${version}"; - filename = "android-studio-" + (if (build != null) then "ide-${build}" else version) + "-linux.tar.gz"; + filename = "android-studio-${version}-linux.tar.gz"; androidStudio = stdenv.mkDerivation { name = "${drvName}-unwrapped"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix index 356eb4923b..84e1c77603 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -9,17 +9,16 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "4.2.2.0"; # "Android Studio 4.2.2" - build = "202.7486908"; - sha256Hash = "18zc9xr2xmphj6m6a1ilwripmvqzplp2583afq1pzzz3cv5h8fvk"; + version = "2020.3.1.22"; # "Android Studio Arctic Fox (2020.3.1)" + sha256Hash = "0xkjnhq1vvrglcbab90mx5xw1q82lkkvyp6y2ap5jypdfsc7pnsa"; }; betaVersion = { version = "2020.3.1.21"; # "Android Studio Arctic Fox (2020.3.1) RC 1" sha256Hash = "04k7c328bl8ixi8bvp2mm33q2hmv40yc9p5dff5cghyycarwpd3f"; }; latestVersion = { # canary & dev - version = "2021.1.1.4"; # "Android Studio Bumblebee (2021.1.1) Canary 4" - sha256Hash = "0s2py7xikzryqrfd9v3in9ia9qv71dd9aad1nzbda6ff61inzizb"; + version = "2021.1.1.5"; # "Android Studio Bumblebee (2021.1.1) Canary 5" + sha256Hash = "0fx6nnazg4548rhb11wzaccm5c2si57mj8qwyl5j17x4k5r3m7nh"; }; in { # Attributes are named by their corresponding release channels diff --git a/third_party/nixpkgs/pkgs/applications/editors/bluej/default.nix b/third_party/nixpkgs/pkgs/applications/editors/bluej/default.nix index a34d6983b2..100178f7da 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/bluej/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/bluej/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bluej"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { # We use the deb here. First instinct might be to go for the "generic" JAR # download, but that is actually a graphical installer that is much harder # to unpack than the deb. url = "https://www.bluej.org/download/files/BlueJ-linux-${builtins.replaceStrings ["."] [""] version}.deb"; - sha256 = "sha256-KhNhJ2xsw1g2yemwP6NQmJvk4cxZAQQNPEUBuLso5qM="; + sha256 = "sha256-9sWfVQF/wCiVDKBmesMpM+5BHjFUPszm6U1SgJNQ8lE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-mac-link/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-mac-link/default.nix index 600e44eb8a..a1328d8e8f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-mac-link/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-mac-link/default.nix @@ -1,14 +1,15 @@ { lib, stdenv, fetchurl, emacs }: stdenv.mkDerivation { - name = "org-mac-link-1.2"; + pname = "org-mac-link"; + version = "1.2"; src = fetchurl { url = "https://raw.githubusercontent.com/stuartsierra/org-mode/master/contrib/lisp/org-mac-link.el"; sha256 = "1gkzlfbhg289r1hbqd25szan1wizgk6s99h9xxjip5bjv0jywcx5"; }; - phases = [ "buildPhase" "installPhase"]; + dontUnpack = true; buildInputs = [ emacs ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/perl-completion/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/perl-completion/default.nix index e14e5ed8cc..515254a42a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/perl-completion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/perl-completion/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0x6qsgs4hm87k0z9q3g4p6508kc3y123j5jayll3jf3lcl2vm6ks"; }; - phases = [ "installPhase"]; + dontUnpack = true; installPhase = '' install -d $out/share/emacs/site-lisp diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/rect-mark/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/rect-mark/default.nix index 1275c51b99..2214b1448d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/rect-mark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/rect-mark/default.nix @@ -1,14 +1,15 @@ { lib, stdenv, fetchurl, emacs }: stdenv.mkDerivation { - name = "rect-mark-1.4"; + pname = "rect-mark"; + version = "1.4"; src = fetchurl { url = "http://emacswiki.org/emacs/download/rect-mark.el"; sha256 = "0pyyg53z9irh5jdfvh2qp4pm8qrml9r7lh42wfmdw6c7f56qryh8"; }; - phases = [ "buildPhase" "installPhase"]; + dontUnpack = true; buildInputs = [ emacs ]; @@ -18,8 +19,10 @@ stdenv.mkDerivation { ''; installPhase = '' + runHook preInstall install -d $out/share/emacs/site-lisp install rect-mark.el* $out/share/emacs/site-lisp + runHook postInstall ''; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix index 985c36ee05..3992fc5c2e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeDesktopItem, makeWrapper, patchelf, writeText -, coreutils, gnugrep, which, git, unzip, libsecret, libnotify +, coreutils, gnugrep, which, git, unzip, libsecret, libnotify, e2fsprogs , vmopts ? null }: @@ -78,7 +78,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([ # Some internals want libstdc++.so.6 - stdenv.cc.cc.lib libsecret + stdenv.cc.cc.lib libsecret e2fsprogs libnotify ] ++ extraLdPath)}" \ --set JDK_HOME "$jdk" \ diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix new file mode 100644 index 0000000000..c71b14f174 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix @@ -0,0 +1,73 @@ +{ pkgs +, stdenv +, lib +, jre +, fetchFromGitHub +, writeShellScript +, runCommand +, imagemagick +}: + +# To test: +# $(nix-build --no-out-link -E 'with import {}; jupyter.override { definitions = { clojure = clojupyter.definition; }; }')/bin/jupyter-notebook + +let + cljdeps = import ./deps.nix { inherit pkgs; }; + classp = cljdeps.makeClasspaths {}; + + shellScript = writeShellScript "clojupyter" '' + ${jre}/bin/java -cp ${classp} clojupyter.kernel.core "$@" + ''; + + pname = "clojupyter"; + version = "0.3.2"; + + meta = with lib; { + description = "A Jupyter kernel for Clojure"; + homepage = "https://github.com/clojupyter/clojupyter"; + license = licenses.mit; + maintainers = with maintainers; [ thomasjm ]; + platforms = jre.meta.platforms; + }; + + sizedLogo = size: stdenv.mkDerivation { + name = "clojupyter-logo-${size}x${size}.png"; + + src = fetchFromGitHub { + owner = "clojupyter"; + repo = "clojupyter"; + rev = "0.3.2"; + sha256 = "1wphc7h74qlm9bcv5f95qhq1rq9gmcm5hvjblb01vffx996vr6jz"; + }; + + buildInputs = [ imagemagick ]; + + dontConfigure = true; + dontInstall = true; + + buildPhase = '' + convert ./resources/clojupyter/assets/logo-64x64.png -resize ${size}x${size} $out + ''; + + inherit meta; + }; + +in + +rec { + launcher = runCommand "clojupyter" { inherit pname version meta shellScript; } '' + mkdir -p $out/bin + ln -s $shellScript $out/bin/clojupyter + ''; + + definition = { + displayName = "Clojure"; + argv = [ + "${launcher}/bin/clojupyter" + "{connection_file}" + ]; + language = "clojure"; + logo32 = sizedLogo "32"; + logo64 = sizedLogo "64"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.edn b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.edn new file mode 100644 index 0000000000..86f489c730 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.edn @@ -0,0 +1 @@ +{:deps {clojupyter/clojupyter {:mvn/version "0.3.2"}}} diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix new file mode 100644 index 0000000000..729db05b6c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix @@ -0,0 +1,1107 @@ +# generated by clj2nix-1.0.5 +{ pkgs ? import {} }: + + let repos = [ + "https://repo1.maven.org/maven2/" + "https://repo.clojars.org/" + "http://oss.sonatype.org/content/repositories/releases/" + "http://oss.sonatype.org/content/repositories/public/" + "http://repo.typesafe.com/typesafe/releases/" + ]; + + in rec { + makePaths = {extraClasspaths ? []}: (builtins.map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages) ++ extraClasspaths; + makeClasspaths = {extraClasspaths ? []}: builtins.concatStringsSep ":" (makePaths {inherit extraClasspaths;}); + + packages = [ + { + name = "javax.inject/javax.inject"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "javax.inject"; + groupId = "javax.inject"; + sha512 = "e126b7ccf3e42fd1984a0beef1004a7269a337c202e59e04e8e2af714280d2f2d8d2ba5e6f59481b8dcd34aaf35c966a688d0b48ec7e96f102c274dc0d3b381e"; + version = "1"; + }; + } + + { + name = "org.clojure/data.json"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "data.json"; + groupId = "org.clojure"; + sha512 = "ce526bef01bedd31b772954d921a61832ae60af06121f29080853f7932326438b33d183240a9cffbe57e00dc3744700220753948da26b8973ee21c30e84227a6"; + version = "0.2.6"; + }; + } + + { + name = "org.clojure/clojure"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "clojure"; + groupId = "org.clojure"; + sha512 = "f28178179483531862afae13e246386f8fda081afa523d3c4ea3a083ab607d23575d38ecb9ec0ee7f4d65cbe39a119f680e6de4669bc9cf593aa92be0c61562b"; + version = "1.10.1"; + }; + } + + { + name = "net.cgrand/sjacket"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "sjacket"; + groupId = "net.cgrand"; + sha512 = "34a359a0a633f116147e5bd52d4f4a9cd755636ce0e8abf155da9c3f04b07f93bbbf7c1f8e370db922e14da0efd36a5b127ff9e564141ca7a843f0498a8b860a"; + version = "0.1.1"; + }; + } + + { + name = "clojupyter/clojupyter"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "clojupyter"; + groupId = "clojupyter"; + sha512 = "3ff95101e9031f0678c1ebd67b0f0d1b50495aa81a69c8f08deb9c2931818bbdd6bcd6f1ef25c407c6714a975c1ef853b4287725641a3fed7b93e1c27ba78709"; + version = "0.3.2"; + }; + } + + { + name = "commons-codec/commons-codec"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "commons-codec"; + groupId = "commons-codec"; + sha512 = "b65531ead8500493e3dd14a860224851b80f438fc53bf8868b443a0557d839a2b0c868e4fedcf99579ae04b6b2bbd8cdb37f9921ad785983c37569aa9d2e8102"; + version = "1.9"; + }; + } + + { + name = "org.clojure/tools.analyzer"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "tools.analyzer"; + groupId = "org.clojure"; + sha512 = "9cce94540a6fd0ae0bad915efe9a30c8fb282fbd1e225c4a5a583273e84789b3b5fc605b06f11e19d7dcc212d08bc6138477accfcde5d48839bec97daa874ce6"; + version = "0.6.9"; + }; + } + + { + name = "org.codehaus.plexus/plexus-component-annotations"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "plexus-component-annotations"; + groupId = "org.codehaus.plexus"; + sha512 = "e20aa9fdb3fda4126f55ef45c36362138c6554ede40fa266ff6b63fe1c3b4d699f9eb95793f26527e096ec7567874aa7af5fe84124815729fdb2d4abaa9ddea8"; + version = "1.7.1"; + }; + } + + { + name = "org.apache.commons/commons-compress"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "commons-compress"; + groupId = "org.apache.commons"; + sha512 = "f3e077ff7f69992961d744dc513eca93606e472e3733657636808a7f50c17f39e3de8367a1af7972cb158f05725808627b6232585a81f197c0da3eff0336913e"; + version = "1.8"; + }; + } + + { + name = "org.apache.commons/commons-lang3"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "commons-lang3"; + groupId = "org.apache.commons"; + sha512 = "9e6ff20e891b6835d5926c90f237d55931e75723c8b88d6417926393e077e71013dab006372d34a6b5801e6ca3ce080a00f202cba700cab5aabfc17bbbdcab36"; + version = "3.5"; + }; + } + + { + name = "org.clojure/core.specs.alpha"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "core.specs.alpha"; + groupId = "org.clojure"; + sha512 = "348c0ea0911bc0dcb08655e61b97ba040649b4b46c32a62aa84d0c29c245a8af5c16d44a4fa5455d6ab076f4bb5bbbe1ad3064a7befe583f13aeb9e32a169bf4"; + version = "0.2.44"; + }; + } + + { + name = "org.tukaani/xz"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "xz"; + groupId = "org.tukaani"; + sha512 = "c5c130bf22f24f61b57fc0c6243e7f961ca2a8928416e8bb288aec6650c1c1c06ace4383913cd1277fc6785beb9a74458807ea7e3d6b2e09189cfaf2fb9ab7e1"; + version = "1.5"; + }; + } + + { + name = "org.zeromq/jeromq"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "jeromq"; + groupId = "org.zeromq"; + sha512 = "0965b82a10136a656dfe48268008536a57b26be9190ff2f3d5dbf3fa298e21bc754e70b1e7fae1aca782d25c397c9ce8fa3832783665391142b31dc4a1bd0233"; + version = "0.5.1"; + }; + } + + { + name = "org.clojure/spec.alpha"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "spec.alpha"; + groupId = "org.clojure"; + sha512 = "18c97fb2b74c0bc2ff4f6dc722a3edec539f882ee85d0addf22bbf7e6fe02605d63f40c2b8a2905868ccd6f96cfc36a65f5fb70ddac31c6ec93da228a456edbd"; + version = "0.2.176"; + }; + } + + { + name = "pandect/pandect"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "pandect"; + groupId = "pandect"; + sha512 = "8c265289f46a94cf2400f05223cdd3f9faee9a39e6ed5a55a3e89b09334a61e928c0f27e2db834edf3b544e2148a511bccf1ef73132bd9263659bed381abb59a"; + version = "0.6.1"; + }; + } + + { + name = "org.clojure/tools.cli"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "tools.cli"; + groupId = "org.clojure"; + sha512 = "9baf3fafe2e92b846404ef1bd897a4a335fe4bc1f78a2408ee93c09dc960a630f58a0e863b2d299624783f2851bb5d83f93fa627276d28d66c92764c46f27efe"; + version = "0.4.2"; + }; + } + + { + name = "com.taoensso/encore"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "encore"; + groupId = "com.taoensso"; + sha512 = "c4928c76378415ac504071ae4812e82efdce3b432c961b0bb9d906a468bb9c51a778f0109ac86641419b1a852ef13ca3d5c54ddde457e5aaec36a2f54f9caf8f"; + version = "2.91.0"; + }; + } + + { + name = "org.apache.maven.resolver/maven-resolver-transport-wagon"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "maven-resolver-transport-wagon"; + groupId = "org.apache.maven.resolver"; + sha512 = "b7a4dcd2f9bb39bfd561e9b2a8fc087bd9e7e59136ea7787341c173fa22c6b8e9370117ed6c30b0c930dd5b188fab2f2b060042861df19e79772a74c703fcf64"; + version = "1.0.3"; + }; + } + + { + name = "org.slf4j/jcl-over-slf4j"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "jcl-over-slf4j"; + groupId = "org.slf4j"; + sha512 = "d9c08c3e4cb18b2d69ba8bcd4bbf3955dbc287e20141d244486f6237c36e8e2cf86ae48c295b5dd579219b5c7b1197658153f10fce73d155a4a1d4e6c7943952"; + version = "1.7.22"; + }; + } + + { + name = "org.clojure/tools.analyzer.jvm"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "tools.analyzer.jvm"; + groupId = "org.clojure"; + sha512 = "ec1cb7638e38dfdca49c88e0b71ecf9c6ea858dccd46a2044bb37d01912ab4709b838cd2f0d1c2f201927ba4eea8f68d4d82e9fdd6da2f9943f7239bf86549f2"; + version = "0.7.2"; + }; + } + + { + name = "org.apache.maven.wagon/wagon-provider-api"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "wagon-provider-api"; + groupId = "org.apache.maven.wagon"; + sha512 = "4571002ad5bfc0442bb2eaf32ec42675dc0a179413230615475842bba12fb561159ffc0213127cf241088641a218627e84049b715b9e71ed83d960f4f09da985"; + version = "3.0.0"; + }; + } + + { + name = "io.pedestal/pedestal.log"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "pedestal.log"; + groupId = "io.pedestal"; + sha512 = "f6c4d8e1b202af9ef7950ec6d02b96f0e598e8d1f9ffffe8e5650e8ffdebd6c4919166aa83e34f47407870473024d28e7a49a2a0ad2b9af221514e42c518baae"; + version = "0.5.7"; + }; + } + + { + name = "org.clojure/tools.macro"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "tools.macro"; + groupId = "org.clojure"; + sha512 = "18fb889ec7f0c8f23084f01587582be3c1baaa475249c40cfa8edc78c75079807ed49f2fb714a5c79b16bcf233142abcf571b12fff4e29cd78850c0016d6b4b9"; + version = "0.1.1"; + }; + } + + { + name = "com.fasterxml.jackson.dataformat/jackson-dataformat-cbor"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "jackson-dataformat-cbor"; + groupId = "com.fasterxml.jackson.dataformat"; + sha512 = "dd49d4a154b8284620704a364ec54fb94638d68424b4f3eaa1d61cccc70959d399e539162f6ac8dcdd6efb0d3817a2edd2bba12fd2630cabd4722cd2ce9b782a"; + version = "2.9.6"; + }; + } + + { + name = "org.flatland/useful"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "useful"; + groupId = "org.flatland"; + sha512 = "b97c92692e36be3e4bdfe4a6b1f1ecb2729c960c25884d1cb12218d0b807789dc37120022b4dd0fd5daba1dd16f892ac134576f84ef301c23525ba55cb041e2d"; + version = "0.11.6"; + }; + } + + { + name = "org.apache.maven.resolver/maven-resolver-transport-http"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "maven-resolver-transport-http"; + groupId = "org.apache.maven.resolver"; + sha512 = "97c23620a57406a8d87a08ab2897355afcce4b53b397ef7d13b4254cb07e965b51f05e21ce2d77ea93c4dbc63f32b3f07ff2171bccfe2b4f21116569968a003e"; + version = "1.0.3"; + }; + } + + { + name = "net.cgrand/parsley"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "parsley"; + groupId = "net.cgrand"; + sha512 = "e114f9e5709b9a38214aabc2b7bb33984693a4302fd8570bb91956bce2755d69b6ee2eaa7224137e306ab1f830672eee928e030677f50739edc62314429fa1f7"; + version = "0.9.3"; + }; + } + + { + name = "funcool/cats"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "cats"; + groupId = "funcool"; + sha512 = "83ccb058078c3c380435512e6f92cfc117244fab4819db776eb963d3b488ac92ca70a783b5d3b776d9d4cf06d9de5d3730c07ce6e7013e6717ba28335601ece8"; + version = "2.3.2"; + }; + } + + { + name = "org.apache.maven/maven-model-builder"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "maven-model-builder"; + groupId = "org.apache.maven"; + sha512 = "6684b58d14e7d037f240ae15ee0456d27354c9dd93a1dc2bdbb66f399b012ffe8ff67a1dd83ee1e45c07fd91af77909a9c19d6b29791002d5b5acf23ca75dcb2"; + version = "3.5.3"; + }; + } + + { + name = "io.aviso/pretty"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "pretty"; + groupId = "io.aviso"; + sha512 = "2c4df86bb572cf028992a1a321178df65d0e681cbbc699db3a149fd0bcf8ad803643bf4e621a9b7793067f128934819371796468288cf5822924b2218711ccac"; + version = "0.1.33"; + }; + } + + { + name = "rewrite-clj/rewrite-clj"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "rewrite-clj"; + groupId = "rewrite-clj"; + sha512 = "14018072e5c9466e8cafc08d68633f0d0a410ceb6631bd48cf7d67056e5bc972618f1b3f80ba00c4fdf88ad884fe58b636945ec6f053cbe14aee61ef173e12d3"; + version = "0.6.1"; + }; + } + + { + name = "org.codehaus.plexus/plexus-utils"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "plexus-utils"; + groupId = "org.codehaus.plexus"; + sha512 = "3805c57b7297459c5e2754d0fd56abd454eee08691974fb930ebb9b79a529fd874f16d40cec66e7fd90d4146c9d1fef45cdb59f9e359fce0c48ac77526fc320d"; + version = "3.1.0"; + }; + } + + { + name = "org.apache.maven.resolver/maven-resolver-transport-file"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "maven-resolver-transport-file"; + groupId = "org.apache.maven.resolver"; + sha512 = "a83cc067c0857f091787120dcbde00f2df5cd6379a02cca95a091aa243ca22dfbae634406c58373b391caf911dd6db3b4ff4a3d51768f4a61b1081e7c78bb252"; + version = "1.0.3"; + }; + } + + { + name = "slingshot/slingshot"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "slingshot"; + groupId = "slingshot"; + sha512 = "ff2b2a27b441d230261c7f3ec8c38aa551865e05ab6438a74bd12bfcbc5f6bdc88199d42aaf5932b47df84f3d2700c8f514b9f4e9b5da28d29da7ff6b09a7fb5"; + version = "0.12.2"; + }; + } + + { + name = "org.flatland/ordered"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "ordered"; + groupId = "org.flatland"; + sha512 = "16ba9c232cefcf363c603af95343db3f86538e3829dce9fba9adce48c3bf2e80c24e4e30a4583750d124aeb9f1031cdbe93d08796366484495b1b22857de3045"; + version = "1.5.7"; + }; + } + + { + name = "commons-io/commons-io"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "commons-io"; + groupId = "commons-io"; + sha512 = "1f6bfc215da9ae661dbabba80a0f29101a2d5e49c7d0c6ed760d1cafea005b7f0ff177b3b741e75b8e59804b0280fa453a76940b97e52b800ec03042f1692b07"; + version = "2.5"; + }; + } + + { + name = "org.apache.maven.wagon/wagon-http-shared"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "wagon-http-shared"; + groupId = "org.apache.maven.wagon"; + sha512 = "d4ef092c8ca8efd4295323d7bdb98315fcf574c2e5e227840847b936ab36095217583c5a807a27e21b831ade4cfbaa570278aa0d1a0144e92b90a42099b541f1"; + version = "3.0.0"; + }; + } + + { + name = "com.fasterxml.jackson.core/jackson-core"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "jackson-core"; + groupId = "com.fasterxml.jackson.core"; + sha512 = "a1b9b68b67d442a47e36b46b37b6b0ad7a10c547a1cf7adb4705baec77356e1080049d310b3b530f66bbd3c0ed05cfe43c041d6ef4ffbbc6731149624df4e699"; + version = "2.9.6"; + }; + } + + { + name = "org.yaml/snakeyaml"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "snakeyaml"; + groupId = "org.yaml"; + sha512 = "b7ef491ded21c61260d6ad68b1541d0c753f01f3f065b66a31c8e4d8f5f6b5eff31e82a7cc68562567811cc0d540c980e8a42714574f50e7713b4799192f50f9"; + version = "1.19"; + }; + } + + { + name = "org.slf4j/jul-to-slf4j"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "jul-to-slf4j"; + groupId = "org.slf4j"; + sha512 = "e76ee7ee3e1852be55c18ccb7a8f4a7005807da3cbd97f4b4895632fee92cc64785491d4f6384ae4ebd0f73a1ee4893dc1adf7119da056300f21eb2e7d3f233f"; + version = "1.7.14"; + }; + } + + { + name = "org.apache.httpcomponents/httpcore"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "httpcore"; + groupId = "org.apache.httpcomponents"; + sha512 = "10814bfb8dcce31034f8fd6822f9da29299529b900616b78d8caf846748cf2b1e093f7b99db26a8580266e3346b822b5edb347004b0d13580e6df85cb327c93c"; + version = "4.4.6"; + }; + } + + { + name = "io.pedestal/pedestal.interceptor"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "pedestal.interceptor"; + groupId = "io.pedestal"; + sha512 = "9767bb8df4ec3d1ee1468c22afd64adc689bb0ae15e98dfc04ef98e65f237f67ded3ade9c1514d2e44e1dd56dbff6cafbc9795a5c57e166cb924f43175c3be83"; + version = "0.5.7"; + }; + } + + { + name = "io.dropwizard.metrics/metrics-core"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "metrics-core"; + groupId = "io.dropwizard.metrics"; + sha512 = "4b500efcc88e717dbbfff9629e12db0f23380bc7dbae820039ed730cdaf26fb6d5be6e58434bd6f688ea3d675576e2057ec183472aac99189817fc28b3c3489e"; + version = "4.1.0"; + }; + } + + { + name = "com.grammarly/omniconf"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "omniconf"; + groupId = "com.grammarly"; + sha512 = "f9b162b98676cb5073310309aac9678725cb4a7eec3fe00803b21ce4abcea3cc1c41df5e970105ed18352619dfab40c0736ae78e9206165f17b0094107b2594b"; + version = "0.3.2"; + }; + } + + { + name = "clj-tuple/clj-tuple"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "clj-tuple"; + groupId = "clj-tuple"; + sha512 = "dd626944d0aba679a21b164ed0c77ea84449359361496cba810f83b9fdeab751e5889963888098ce4bf8afa112dbda0a46ed60348a9c01ad36a2e255deb7ab6d"; + version = "0.2.2"; + }; + } + + { + name = "eu.neilalexander/jnacl"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "jnacl"; + groupId = "eu.neilalexander"; + sha512 = "addba1eae1975a71a204557dafb111c5c2aab39d9a7bb6428a26107935d95290139381c0a283b77e67b44e1d8110d3fa3919d7e7fc73e0023771beece4eab994"; + version = "1.0.0"; + }; + } + + { + name = "zprint/zprint"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "zprint"; + groupId = "zprint"; + sha512 = "379b6f9228ec0b5ae1a24b0cce4c41e273534b456cf356ac67b7f72a7506345eddf7f7ac75c2c200864d5372c1fb0331d2b31bc22a21c496cafdfe839241e9f9"; + version = "0.4.15"; + }; + } + + { + name = "com.taoensso/truss"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "truss"; + groupId = "com.taoensso"; + sha512 = "601bdac92eb0432de228717d3feb7f8a24f484eaf8b93a98c95ee42a0d57bd3dd7d2929c21dadb3a9b43d5e449821d30bbcf4e5ae198dcb8c62ec9597ff57524"; + version = "1.5.0"; + }; + } + + { + name = "org.apache.maven.resolver/maven-resolver-api"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "maven-resolver-api"; + groupId = "org.apache.maven.resolver"; + sha512 = "d00cd4ec92bfafe88d9c4f4ce91e6c2d581d416a096743d396c1712a5788239cf2d55f910e1c0024034f7e0d8028ff602339b87c8fd3ad54f665a8b63d142e67"; + version = "1.1.1"; + }; + } + + { + name = "hiccup/hiccup"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "hiccup"; + groupId = "hiccup"; + sha512 = "034f15be46c35029f41869c912f82cb2929fbbb0524ea64bd98dcdb9cf09875b28c75e926fa5fff53942b0f9e543e85a73a2d03c3f2112eecae30fcef8b148f4"; + version = "1.0.5"; + }; + } + + { + name = "io.opentracing/opentracing-api"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "opentracing-api"; + groupId = "io.opentracing"; + sha512 = "931197ca33e509570e389cd163af96e277bb3635f019e34e2fc97d3fa9c34bb9042f25b2ba8aa59f8516cc044ec3e9584462601b8aa5f954bbc6ad88e5fbe5cd"; + version = "0.33.0"; + }; + } + + { + name = "org.apache.maven/maven-resolver-provider"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "maven-resolver-provider"; + groupId = "org.apache.maven"; + sha512 = "ec9e402084886554d247232b3dc5a971f6cbc93206759104ee7f94c7ba3ea2d69a715c68e479d2c64f6fe5045b6d7bd75cc3bb239462464ac608b0db1a5f0db5"; + version = "3.5.3"; + }; + } + + { + name = "commons-logging/commons-logging"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "commons-logging"; + groupId = "commons-logging"; + sha512 = "ed00dbfabd9ae00efa26dd400983601d076fe36408b7d6520084b447e5d1fa527ce65bd6afdcb58506c3a808323d28e88f26cb99c6f5db9ff64f6525ecdfa557"; + version = "1.2"; + }; + } + + { + name = "com.google.guava/guava"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "guava"; + groupId = "com.google.guava"; + sha512 = "d8736b5151df2dd052c09548a118af15a8b8b40999954cd093cfd301445accb8b7e9532b36bac8b2fab9234a24e2e05009a33d0a8e149e841ebddbcc733a8e4c"; + version = "20.0"; + }; + } + + { + name = "com.fzakaria/slf4j-timbre"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "slf4j-timbre"; + groupId = "com.fzakaria"; + sha512 = "93ecc0e133a3f02f521cac125fd8842f94f2c284000b6b9f1cda7ef2841567bd674facea1f8c4e32da2321f414c1f2590ac58abf37f23347f6f551fcd9039339"; + version = "0.3.14"; + }; + } + + { + name = "clojure.java-time/clojure.java-time"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "clojure.java-time"; + groupId = "clojure.java-time"; + sha512 = "a7111b5c78d7f920d74793d410f81c9ca3c9a8c4d652f132be55eb15f6d03a413cee1ae46bad6d3189c045d422a33c7320fbd02055c351779c379f75db48cbbd"; + version = "0.3.2"; + }; + } + + { + name = "org.apache.maven.resolver/maven-resolver-spi"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "maven-resolver-spi"; + groupId = "org.apache.maven.resolver"; + sha512 = "bb58083c5ef2b6d3915acb368c80bd55ca6318925c606ad74e3e4ab2fc0066c7fa2480cefa34487c5349f1edff02131bbaa4c3a426f9a52d5a6a66a4a023d452"; + version = "1.1.1"; + }; + } + + { + name = "org.clojure/algo.generic"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "algo.generic"; + groupId = "org.clojure"; + sha512 = "2ded22096f7bf051fcc649d56fdb0ef2dddcb5490e22ce4d7e6f714d910db0cc7d453862b2180169641c21f0754b799036e4b0e7944c79f29d22dcb4152e384d"; + version = "0.1.3"; + }; + } + + { + name = "com.taoensso/timbre"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "timbre"; + groupId = "com.taoensso"; + sha512 = "cbb47d1ba312ca5f8ffdb2953401e0b37b308529c49622d4eb57e1d128ae56768051a2e01264c3a3fe8ef1c8a8785fcc29bc9336ccc70e629f2ab432280e6d7f"; + version = "4.10.0"; + }; + } + + { + name = "org.clojure/java.jdbc"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "java.jdbc"; + groupId = "org.clojure"; + sha512 = "50c263853f0b88d4b46746bf8f5efb8536f38dde2a08c26e5d26c2bd3bd851c0c0f0814d7899019c3879de2667b3b432a23de091bd8f8cea3e28bd00f0b715cb"; + version = "0.7.9"; + }; + } + + { + name = "org.apache.maven.wagon/wagon-http"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "wagon-http"; + groupId = "org.apache.maven.wagon"; + sha512 = "e565e6541d53a5c2823a211586163707a5dbf5d9b3dd9f4a8d1d9dd2ffc0c8cf3ef2adb78d455235d22ede99d2e4619eb7f94d2a52eb0ffd119b52b33f9d89ba"; + version = "3.0.0"; + }; + } + + { + name = "io.opentracing/opentracing-noop"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "opentracing-noop"; + groupId = "io.opentracing"; + sha512 = "c727bcf20504fa72bfc07456bdde3b0b50988632d85c7af78df742efd90a431c125f5d644273203fa211a62fc4a282455cf281c7c82b82df4695afbc5488577f"; + version = "0.33.0"; + }; + } + + { + name = "net.cgrand/regex"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "regex"; + groupId = "net.cgrand"; + sha512 = "f0dfa4727818765364ce1793337597b06a2f95364245ab6c860e2373a98da55771e77a7eb772dcf415a336d8caad35673d5054e18b9494c3e1b9f882fecfb4d9"; + version = "1.1.0"; + }; + } + + { + name = "cider/cider-nrepl"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "cider-nrepl"; + groupId = "cider"; + sha512 = "2c665aeb6c31eb2d11f257966f19e6127d602546a8fea2ab19eed3352469f93bd870c210250cc3f8b89d68d61f6076a614b87d1792a1ab3a3fd8f3b974842f75"; + version = "0.21.1"; + }; + } + + { + name = "com.cemerick/pomegranate"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "pomegranate"; + groupId = "com.cemerick"; + sha512 = "a08137b575305aeff9858b93fc1febba92aaff27d9994e884c0e614f43704403cfb7e3e8d819a8151966c6439c178f4fb371003c392591dbc87b9e0fa64788fd"; + version = "1.1.0"; + }; + } + + { + name = "org.codehaus.plexus/plexus-interpolation"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "plexus-interpolation"; + groupId = "org.codehaus.plexus"; + sha512 = "d9183dc0920fb996901644903194883d1e1d1e8c4863f3c55bd6a9b14de996ee30651849435a92c8c55fc82be0e4524f1b2741957f9464434da292188ffcee70"; + version = "1.24"; + }; + } + + { + name = "org.apache.httpcomponents/httpclient"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "httpclient"; + groupId = "org.apache.httpcomponents"; + sha512 = "f8d4a960ed235770570afaf793c4596404adfa777e08bdb87ae2db92575db5e11755025fe43969f852ef505a390833e79bdd1fccd5f3fb7dee87625607b504a2"; + version = "4.5.3"; + }; + } + + { + name = "cheshire/cheshire"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "cheshire"; + groupId = "cheshire"; + sha512 = "46d638d3e261e2debcaae9bdf912abaad4e77218ee0ba25ad0ff71dc040f579e630e593d55cd84dc9815bf84df33650295243cbeb8ff868976854544dd77de2c"; + version = "5.8.1"; + }; + } + + { + name = "tigris/tigris"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "tigris"; + groupId = "tigris"; + sha512 = "5393fe3f656521a6760d289d9549ffb9e9c1a8a72b69878205d53763802afa8778f1cb8bed6899e0b9721de231a79b8b1254cc601c84f5374467f1cc4780a987"; + version = "0.1.1"; + }; + } + + { + name = "org.clojure/core.match"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "core.match"; + groupId = "org.clojure"; + sha512 = "d69ed23bad115ed665b402886e1946fcecacbbfd05150f3eb66dce9ffc0381d0e02ed6f41cb390a6dfb74f4f26e3b0f6793dec38f6a4622dc53c0739d79f5f5e"; + version = "0.3.0"; + }; + } + + { + name = "org.clojure/tools.reader"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "tools.reader"; + groupId = "org.clojure"; + sha512 = "3d6d184a30cead093a158a69feaff8685a24a8089b0245f2b262d26ff46c7fd0be6940bdaccb0b5b06f87cba7ac59e677f74afff1cfbd67dc2b32e2a1ff19541"; + version = "1.2.2"; + }; + } + + { + name = "org.tcrawley/dynapath"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "dynapath"; + groupId = "org.tcrawley"; + sha512 = "1b0caf390515212e6b151d6c227b1a62e430e682b6c811736edba3cc918344053e35c092e12afd523198ed6244018450931776f8388e61a593f266476b6db19e"; + version = "1.0.0"; + }; + } + + { + name = "io.opentracing/opentracing-util"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "opentracing-util"; + groupId = "io.opentracing"; + sha512 = "fbba29ff3d6018561077e9539ad9b72876424600eca3addb6a26981a4a3e52cb3dfd30f27945aff2b6c222c42454ce3ba67597171fd809a74c65b920f3a47c7a"; + version = "0.33.0"; + }; + } + + { + name = "org.jsoup/jsoup"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "jsoup"; + groupId = "org.jsoup"; + sha512 = "8119ec44ee622c75f47a80dedeadf557744208dc49d3d9f579660929a0be3f71d3b8cb4aed64ee31f6bf7488bfc3516fb3980137d2fc63063caf46c9921f19f0"; + version = "1.7.2"; + }; + } + + { + name = "nrepl/nrepl"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "nrepl"; + groupId = "nrepl"; + sha512 = "f9ffc647820e772428781cb4ccd4f84a7d903afffe64418af55c95bd7bc21e1722591ac425d1be366d8f4f4596debf0c1b006957848473d3c515f4187cd5cb86"; + version = "0.6.0"; + }; + } + + { + name = "org.apache.maven.resolver/maven-resolver-connector-basic"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "maven-resolver-connector-basic"; + groupId = "org.apache.maven.resolver"; + sha512 = "c8c14480ed89cf5d4cfec5dee7dae366b0b5d003cd835d4b1358add81253b205a53f6a62e5ecc145f09406fc8c57adb5fbf8f4521a044ac3d37b5fa8e67d4e21"; + version = "1.0.3"; + }; + } + + { + name = "org.xerial/sqlite-jdbc"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "sqlite-jdbc"; + groupId = "org.xerial"; + sha512 = "efd1ea26d7f4f9bc66bf0d5f80234a0c535829bd498e4c5a0cab42873b58ac69133497d8c45689a1d3a39e657a2d0474d6b930c7bc415dd623801ee4a7354ffb"; + version = "3.25.2"; + }; + } + + { + name = "org.apache.maven.resolver/maven-resolver-impl"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "maven-resolver-impl"; + groupId = "org.apache.maven.resolver"; + sha512 = "3ffcac7ed4a05b2b58669ce05cc348acad627be3e0941ee28a9a665fea43a571d554005dd72ec51130083f792e31894880525df3cd6962d7c95885340abfb7da"; + version = "1.1.1"; + }; + } + + { + name = "org.slf4j/slf4j-api"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "slf4j-api"; + groupId = "org.slf4j"; + sha512 = "a944468440a883bb3bde1f78d39abe43a90b6091fd9f1a70430ac10ea91b308b2ef035e4836d68ba97afdba2b04f62edece204278aaa416276a5f8596f8688af"; + version = "1.7.26"; + }; + } + + { + name = "org.apache.maven/maven-model"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "maven-model"; + groupId = "org.apache.maven"; + sha512 = "888a778101774265e0d8dbc96305274053d275c0b261e81c6aae8765f92b13d1e06c5aa8f51c7d53d5267e46041adc9218686e53fc47cc15563a1b178291bc16"; + version = "3.5.3"; + }; + } + + { + name = "org.clojure/test.check"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "test.check"; + groupId = "org.clojure"; + sha512 = "ba7b5c915c1e7bd5e9e398f8cd9d74340ca3c4846483bae8f2191e40ea42bdd4d8019ec108c2bd64451f418abebed2258cf0ee5be597cc0bc8a02d772c6385ed"; + version = "0.10.0-RC1"; + }; + } + + { + name = "org.apache.maven.resolver/maven-resolver-util"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "maven-resolver-util"; + groupId = "org.apache.maven.resolver"; + sha512 = "91dcbb8184f06e64da35d40c7b96e854f7311b6232d74b4b6d3489a51e0c05ebbee44f59367ab118974cdb6c5b3747981a41869cc7372691b2c2e1d0daa2ffa3"; + version = "1.1.1"; + }; + } + + { + name = "io.dropwizard.metrics/metrics-jmx"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "metrics-jmx"; + groupId = "io.dropwizard.metrics"; + sha512 = "706f7428b967923d2792b0587684e972b1404d663a6ac3d661772a57edf096f0de0efac8bbfcead4576c008b096c33f77499e8f193ccbb8b072d7aa6e6d7a40d"; + version = "4.1.0"; + }; + } + + { + name = "io.forward/yaml"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "yaml"; + groupId = "io.forward"; + sha512 = "561cfe0e92689b95008948a0a8aa839b9932ffd13791fdbd9ce55e0b0e3c895be6441ccd050b62ff671c747373fcba1199246c8bfb4206cb05584d06dea99b7c"; + version = "1.0.9"; + }; + } + + { + name = "me.raynes/fs"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "fs"; + groupId = "me.raynes"; + sha512 = "b72af0093c1feccf78ea0632ba523eca89436b0575abc0af484e03570011aa89f429f9820a9fc27f60da113d728d2bbc09ba26d3a0cdd63d9d9c7775643f6852"; + version = "1.4.6"; + }; + } + + { + name = "org.clojure/core.memoize"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "core.memoize"; + groupId = "org.clojure"; + sha512 = "e1c5104ac20a22e670ccb80c085ce225c168802829668e91c316cbea4f8982431a9e2ac7bfa5e8477ef515088e9443763f44496633c8ee1e416f7eb8ddfefb88"; + version = "0.5.9"; + }; + } + + { + name = "camel-snake-kebab/camel-snake-kebab"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "camel-snake-kebab"; + groupId = "camel-snake-kebab"; + sha512 = "3108a207378e8b6199ae6c71517fcc65dde97d2bab67d533a618c7ff50ea8b849ead3880857d00629d6c269499384b564ed43b631e6b06f283af94e8cae89144"; + version = "0.4.0"; + }; + } + + { + name = "org.apache.maven/maven-repository-metadata"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "maven-repository-metadata"; + groupId = "org.apache.maven"; + sha512 = "6d898373d483ac7f24ab0256406f4be45035f95a247bb19ac7102ea7f5e336976381c5125b30a7148bc9a8e1df6d27b456d1f8e9b55b99d9688e37dfd03733a3"; + version = "3.5.3"; + }; + } + + { + name = "io.simplect/compose"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "compose"; + groupId = "io.simplect"; + sha512 = "0aceab86d4a97285ddd6d40abdeb5b9bea16a16b6509ef2fcd80e547d772185041e26abcc12ae11938d7b78fed175850f811d5cb2a2f0590524c2c11975bacd1"; + version = "0.7.27"; + }; + } + + { + name = "org.clojure/data.priority-map"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "data.priority-map"; + groupId = "org.clojure"; + sha512 = "450e18bddb3962aee3a110398dc3e9c25280202eb15df2f25de6c26e99982e8de5cf535fe609948d190e312a00fad3ffc0b3a78b514ef66369577a4185df0a77"; + version = "0.0.7"; + }; + } + + { + name = "org.apache.maven/maven-builder-support"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "maven-builder-support"; + groupId = "org.apache.maven"; + sha512 = "1b2ca4427772532cfb93b4d643b17eca5843f1e1a9c4b26089eed8c10028344fb85d593d133fdffaff07b552c3027a9f24e1a92d68ed4696682be04069e84583"; + version = "3.5.3"; + }; + } + + { + name = "org.slf4j/log4j-over-slf4j"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "log4j-over-slf4j"; + groupId = "org.slf4j"; + sha512 = "d0a13ae82823b921b308c897ec9a11ef86cb1b52dd81343f856224c65851f70eae0890a88550daa3a4ed57e7e2c150018a3cdc2345924a4e489a88827fc639b6"; + version = "1.7.14"; + }; + } + + { + name = "org.clojure/core.cache"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "core.cache"; + groupId = "org.clojure"; + sha512 = "464c8503229dfcb5aa3c09cd74fa273ae82aff7a8f8daadb5c59a4224c7d675da4552ee9cb28d44627d5413c6f580e64df4dbfdde20d237599a46bb8f9a4bf6e"; + version = "0.6.5"; + }; + } + + { + name = "rewrite-cljs/rewrite-cljs"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "rewrite-cljs"; + groupId = "rewrite-cljs"; + sha512 = "d87c07d510247e1b13dcb505436b3a43d8bb9a4bfebbd2ae0430249d2c8a859032affe2b2a4cda8f987e983f584fd999a3f9b87944d44b8837cdf4e2560c5ab9"; + version = "0.4.4"; + }; + } + + { + name = "org.ow2.asm/asm-all"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "asm-all"; + groupId = "org.ow2.asm"; + sha512 = "462f31f8889c5ff07f1ce7bb1d5e9e73b7ec3c31741dc2b3da8d0b1a50df171e8e72289ff13d725e80ecbd9efa7e873b09870f5e8efb547f51f680d2339f290d"; + version = "4.2"; + }; + } + + { + name = "org.clojure/core.async"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "core.async"; + groupId = "org.clojure"; + sha512 = "f80d61b51b5278c6c8b2b81ed45fa24ebaa42ade10e495fe34c5e1d827713eab33701a86dcc226a76e334365b0bd69d0c9da1e8b337f8752cd490145d3fc98b8"; + version = "0.4.500"; + }; + } + + { + name = "com.fasterxml.jackson.dataformat/jackson-dataformat-smile"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "jackson-dataformat-smile"; + groupId = "com.fasterxml.jackson.dataformat"; + sha512 = "bc0b293687b9aa6641a6983d4c09d901294010fd0710c8163b0b283f06d044cfd2d7cebdb2590b170fefdde4751406b704955f59312af27d0e1f12f0d6c81ed8"; + version = "2.9.6"; + }; + } + + { + name = "org.apache.maven/maven-artifact"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "maven-artifact"; + groupId = "org.apache.maven"; + sha512 = "a4cafc89d66c8f074c5c3f9454e5077abc0de6242c29904d8ee5816348af21b1006da67f3118478bc9eb067725c39be9b88e4a019eb8368c936f971f0499c2ca"; + version = "3.5.3"; + }; + } + + { + name = "org.clojure/data.codec"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "data.codec"; + groupId = "org.clojure"; + sha512 = "cb6910fc0ee47ce6959a442ba3ef456dd91fe8589a576526d20fd661c8d305962f64a8e8ebde69f0bd00082027dbd0ac52b642fcd4950b4f0e5b7a1205f95138"; + version = "0.1.1"; + }; + } + + ]; + } diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/update.sh b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/update.sh new file mode 100755 index 0000000000..ba3ed46657 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/update.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +### To update clj2nix +# $ nix-prefetch-github hlolli clj2nix + +nix-shell --run "clj2nix deps.edn deps.nix" -E ' +with import ../../../../.. { }; +mkShell { + buildInputs = [(callPackage (fetchFromGitHub { + owner = "hlolli"; + repo = "clj2nix"; + rev = "b9a28d4a920d5d680439b1b0d18a1b2c56d52b04"; + sha256 = "0d8xlja62igwg757lab9ablz1nji8cp9p9x3j0ihqvp1y48w2as3"; + }) {})]; +} +' diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 338a1e23af..3131c3a7bf 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "14j1bss4bqw39ijmyh0kyr5xgzq61bc0if7g94jkvdbngz6fa25f"; - x86_64-darwin = "0922r49475j1i8jrx5935bly7cv26hniz9iqf30qj6qs6d8kibci"; - aarch64-linux = "11kkys3fsf4a4hvqv524fkdl686addd3ygzz0mav09xh8wjqbisw"; - aarch64-darwin = "1xk56ww2ndksi6sqnr42zcqx2fl52aip3jb4fmdmqg1cvllfx0sd"; - armv7l-linux = "1jiyjknl2xxivifixcwvyi6qsq7kr71gbalzdj6xca2i6pc1gbvp"; + x86_64-linux = "0i2pngrp2pcas99wkay7ahrcn3gl47gdjjaq7ladr879ypldh24v"; + x86_64-darwin = "1pni2cd5s6m9jxwpja4ma9xlr1q3xl46w8pim3971dw3xi5r29pg"; + aarch64-linux = "0j71ha2df99583w8r2l1hppn6wx8ll80flwcj5xzj7icv3mq8x7v"; + aarch64-darwin = "0vhp1z890mvs8hnwf43bfv74a7y0pv5crjn53rbiy0il1ihs1498"; + armv7l-linux = "07yb0ia1rnbav3gza2y53yd3bcxqmngddd4jz6p4y0m539znl817"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.59.0"; + version = "1.59.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; @@ -39,7 +39,7 @@ in sourceRoot = ""; - updateScript = ./update-vscodium.sh; + updateScript = ./update-vscode.sh; meta = with lib; { description = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index 0a1568b4e1..a4d40a0b4f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0yx0h7rd8v9j3yq863dj78bm587s8lpisbn1skb5whv6qv88x7c0"; - x86_64-darwin = "1b5jr08cgl49rh26id8iwi64d32ssr7kis72zcqg0jkw7larxvvh"; - aarch64-linux = "1a62krnilfi7nr7mmxyv3danj7h2yfdwg784q8vhrdjyqjd8gjbs"; - armv7l-linux = "1axazx7hf6iw0dq1m2049kfrmk8jndycz9pcn3csj6rm65plg746"; + x86_64-linux = "1z8sxdzwbjip8csrili5l36v1kl3iq8fw19dhfnkjs3fl0sn360k"; + x86_64-darwin = "0sp5k4pk9yjx16c79hqrwn64f2ab82iizm1cy93y9rr2r3px1yga"; + aarch64-linux = "03qm5008knigsahs6zz5c614g1kid3k0ndg8vb0flfwmdrajrdw3"; + armv7l-linux = "0sls3m5zwz6w01k7jym0vwbz006bkwv23yba7gf1gg84vbqgpb1x"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.59.0"; + version = "1.59.1"; pname = "vscodium"; executableName = "codium"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix index bea8aed3fb..46e4de2754 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "akira"; - version = "0.0.15"; + version = "0.0.16"; src = fetchFromGitHub { owner = "akiraux"; repo = "Akira"; rev = "v${version}"; - sha256 = "sha256-2GhpxajymLVAl2P6vZ0+nuZK3ZRRktFswWkj7TP8eHI="; + sha256 = "sha256-qrqmSCwA0kQVFD1gzutks9gMr7My7nw/KJs/VPisa0w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/cloudcompare/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/cloudcompare/default.nix index 26fabc364b..9fbe390f5d 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/cloudcompare/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/cloudcompare/default.nix @@ -1,6 +1,7 @@ { lib , mkDerivation , fetchFromGitHub +, fetchpatch , cmake , dxflib , eigen @@ -18,7 +19,7 @@ mkDerivation rec { pname = "cloudcompare"; - version = "2.11.2"; + version = "2.11.2"; # Remove below patch with the next version bump. src = fetchFromGitHub { owner = "CloudCompare"; @@ -33,6 +34,15 @@ mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # TODO: Remove with next CloudCompare release (see https://github.com/CloudCompare/CloudCompare/pull/1478) + (fetchpatch { + name = "CloudCompare-fix-for-PDAL-2.3.0.patch"; + url = "https://github.com/CloudCompare/CloudCompare/commit/f3038dcdeb0491c4a653c2ee6fb017326eb676a3.patch"; + sha256 = "0ca5ry987mcgsdawz5yd4xhbsdb5k44qws30srxymzx2djvamwli"; + }) + ]; + nativeBuildInputs = [ cmake eigen # header-only diff --git a/third_party/nixpkgs/pkgs/applications/graphics/dosage/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/dosage/default.nix index db0012a184..e5e77dccbb 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/dosage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/dosage/default.nix @@ -1,28 +1,30 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "dosage"; - version = "2018.04.08"; - PBR_VERSION = version; + version = "2.17"; - src = fetchFromGitHub { - owner = "webcomics"; - repo = "dosage"; - rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591"; - sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh"; + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0vmxgn9wd3j80hp4gr5iq06jrl4gryz5zgfdd2ah30d12sfcfig0"; }; - checkInputs = with python3Packages; [ pytest responses ]; - propagatedBuildInputs = with python3Packages; [ colorama lxml requests pbr setuptools ]; + + checkInputs = with python3Packages; [ + pytestCheckHook pytest-xdist responses + ]; + + nativeBuildInputs = with python3Packages; [ setuptools-scm ]; + + propagatedBuildInputs = with python3Packages; [ + colorama imagesize lxml requests setuptools six + ]; disabled = python3Packages.pythonOlder "3.3"; - checkPhase = '' - py.test tests/ - ''; - meta = { description = "A comic strip downloader and archiver"; homepage = "https://dosage.rocks/"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ toonn ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix index f46e1f499c..fb5308921d 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix @@ -2,7 +2,6 @@ , lib , mkDerivation , fetchFromGitHub -, fetchpatch , extra-cmake-modules # common deps diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix index 2b8dbbc4d2..1715542adc 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix @@ -53,8 +53,13 @@ let ); scriptDerivation = {src, ...}@attrs : pluginDerivation ({ - phases = [ "extraLib" "installPhase" ]; - installPhase = "installScripts ${src}"; + prePhases = "extraLib"; + dontUnpack = true; + installPhase = '' + runHook preInstall + installScripts ${src} + runHook postInstall + ''; } // attrs); in { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix index 1cf1531ef3..de952e866d 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 = "450"; + version = "451"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-sMy5Yv7PGK3U/XnB8IrutSqSBiq1cfD6pAO5BxbWG5A="; + sha256 = "sha256-HoaXbnhwh6kDWgRFVs+VttzIY3MaxriteFTE1fwBUYs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/rx/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/rx/default.nix index a40371ddb4..fe3d10bae6 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/rx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/rx/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { # FIXME: GLFW (X11) requires DISPLAY env variable for all tests doCheck = false; - postInstall = optional stdenv.isLinux '' + postInstall = optionalString stdenv.isLinux '' mkdir -p $out/share/applications cp $src/rx.desktop $out/share/applications wrapProgram $out/bin/rx --prefix LD_LIBRARY_PATH : ${libGL}/lib diff --git a/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix b/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix new file mode 100644 index 0000000000..c479820ba0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix @@ -0,0 +1,37 @@ +{ lib, fetchurl, appimageTools }: + +let + pname = "anytype"; + version = "0.18.59"; + name = "Anytype-${version}"; + nameExecutable = pname; + src = fetchurl { + url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; + name = "Anytype-${version}.AppImage"; + sha256 = "sha256-HDhDd23kXhIFXg+QKPNpR2R6QC4oJCnut+gD//qMK1Y="; + }; + appimageContents = appimageTools.extractType2 { inherit name src; }; +in +appimageTools.wrapType2 { + inherit name src; + + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) + ++ [ pkgs.libsecret ]; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + install -m 444 -D ${appimageContents}/anytype2.desktop -t $out/share/applications + substituteInPlace $out/share/applications/anytype2.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/0x0/apps/anytype2.png \ + $out/share/icons/hicolor/512x512/apps/anytype2.png + ''; + + meta = with lib; { + description = "P2P note-taking tool"; + homepage = "https://anytype.io/"; + license = licenses.unfree; + maintainers = with maintainers; [ bbigras ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix index 0a89e4f476..fd58ea48e5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix @@ -1,23 +1,55 @@ -{ lib -, buildPythonApplication -, fetchPypi -, appdirs -, attrs -, beautifulsoup4 -, click-plugins -, elasticsearch -, flask-compress -, flask_login -, flask_wtf -, html2text -, python-dotenv -, python-frontmatter -, requests -, tinydb -, validators -, werkzeug -, wtforms -}: +{ lib, stdenv, python3, fetchPypi }: + +let + defaultOverrides = [ + (self: super: { + flask = super.flask.overridePythonAttrs (oldAttrs: rec { + version = "1.1.2"; + pname = "Flask"; + + src = super.fetchPypi { + inherit pname version; + sha256 = "sha256-Tvoa4tfJhlr0iYbeiuuFBL8yx/PW/ck1PTSyH0sScGA="; + }; + + checkInputs = [ self.pytest ]; + propagatedBuildInputs = with self; [ itsdangerous click werkzeug jinja2 ]; + + doCheck = false; + }); + }) + + (self: super: { + flask_login = super.flask_login.overridePythonAttrs (oldAttrs: rec { + pname = "Flask"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b"; + }; + doCheck = false; + }); + }) + ]; + + mkOverride = attrname: version: sha256: + self: super: { + ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: { + inherit version; + src = oldAttrs.src.override { + inherit version sha256; + }; + }); + }; + + py = python3.override { + # Put packageOverrides at the start so they are applied after defaultOverrides + packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) (defaultOverrides); + }; + +in +with py.pkgs; buildPythonApplication rec { pname = "archivy"; @@ -40,8 +72,7 @@ buildPythonApplication rec { --replace 'validators ==' 'validators >=' \ --replace 'tinydb ==' 'tinydb >=' \ --replace 'Flask_WTF == 0.14.3' 'Flask_WTF' \ - --replace 'Werkzeug ==' 'Werkzeug >=' \ - --replace 'Flask ==' 'Flask >=' + --replace 'Werkzeug ==' 'Werkzeug >=' ''; propagatedBuildInputs = [ @@ -57,6 +88,7 @@ buildPythonApplication rec { python-dotenv python-frontmatter requests + setuptools tinydb validators werkzeug diff --git a/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix b/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix index 7215cc5644..b2ca9a0cab 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix @@ -1,32 +1,83 @@ -{ lib, stdenv, fetchFromGitHub, glibc, python3, cudatoolkit, - withCuda ? true +{ stdenv +, lib +, fetchFromGitHub +, fetchzip +, cmake +, glibc_multi +, glibc +, git +, pkg-config +, cudatoolkit +, withCuda ? false +, linuxPackages }: -with lib; +let + hwloc = stdenv.mkDerivation rec { + pname = "hwloc"; + version = "2.2.0"; + + src = fetchzip { + url = "https://download.open-mpi.org/release/hwloc/v${lib.versions.majorMinor version}/hwloc-${version}.tar.gz"; + sha256 = "1ibw14h9ppg8z3mmkwys8vp699n85kymdz20smjd2iq9b67y80b6"; + }; + + configureFlags = [ + "--enable-static" + "--disable-libudev" + "--disable-shared" + "--disable-doxygen" + "--disable-libxml2" + "--disable-cairo" + "--disable-io" + "--disable-pci" + "--disable-opencl" + "--disable-cuda" + "--disable-nvml" + "--disable-gl" + "--disable-libudev" + "--disable-plugin-dlopen" + "--disable-plugin-ltdl" + ]; + + nativeBuildInputs = [ pkg-config ]; + + enableParallelBuilding = true; + + outputs = [ "out" "lib" "dev" "doc" "man" ]; + }; + +in stdenv.mkDerivation rec { pname = "firestarter"; - version = "1.7.4"; + version = "2.0"; src = fetchFromGitHub { owner = "tud-zih-energy"; repo = "FIRESTARTER"; rev = "v${version}"; - sha256 = "0zqfqb7hf48z39g1qhbl1iraf8rz4d629h1q6ikizckpzfq23kd0"; + sha256 = "1ik6j1lw5nldj4i3lllrywqg54m9i2vxkxsb2zr4q0d2rfywhn23"; + fetchSubmodules = true; }; - nativeBuildInputs = [ python3 ]; - buildInputs = [ glibc.static ] ++ optionals withCuda [ cudatoolkit ]; - preBuild = '' - mkdir -p build - cd build - python ../code-generator.py ${optionalString withCuda "--enable-cuda"} - ''; - makeFlags = optionals withCuda [ "LINUX_CUDA_PATH=${cudatoolkit}" ]; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake git pkg-config ]; + + buildInputs = [ hwloc ] ++ (if withCuda then + [ glibc_multi cudatoolkit linuxPackages.nvidia_x11 ] + else + [ glibc.static ]); + + cmakeFlags = [ + "-DFIRESTARTER_BUILD_HWLOC=OFF" + "-DCMAKE_C_COMPILER_WORKS=1" + "-DCMAKE_CXX_COMPILER_WORKS=1" + ] ++ lib.optionals withCuda [ + "-DFIRESTARTER_BUILD_TYPE=FIRESTARTER_CUDA" + ]; installPhase = '' mkdir -p $out/bin - cp FIRESTARTER $out/bin/firestarter + cp src/FIRESTARTER${lib.optionalString withCuda "_CUDA"} $out/bin/ ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index a2280e8bb0..0803fadc2a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "9.2"; + version = "9.3"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-pU02Eaq6tB7X6EPOo8YAyryJRbSV3KebQv8VELxXaBw="; + sha256 = "sha256-h/OWYzZkouhTC7j8HIOt94DHwNyhbkYGoy3wUYrh0O8="; }; patches = (substituteAll { diff --git a/third_party/nixpkgs/pkgs/applications/misc/lsd2dsl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lsd2dsl/default.nix index b30d652584..8c88430527 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lsd2dsl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lsd2dsl/default.nix @@ -1,23 +1,33 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake +{ lib, stdenv, mkDerivation, fetchFromGitHub +, makeDesktopItem, copyDesktopItems, cmake , boost, libvorbis, libsndfile, minizip, gtest, qtwebkit }: mkDerivation rec { pname = "lsd2dsl"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "nongeneric"; repo = pname; rev = "v${version}"; - sha256 = "0s0la6zkg584is93p4nj1ha3pbnvadq84zgsv8nym3r35n7k8czi"; + sha256 = "sha256-PLgfsVVrNBTxI4J0ukEOFRoBkbmB55/sLNn5KyiHeAc="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isLinux copyDesktopItems; buildInputs = [ boost libvorbis libsndfile minizip gtest qtwebkit ]; NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces"; + desktopItems = lib.singleton (makeDesktopItem { + name = "lsd2dsl"; + exec = "lsd2dsl-qtgui"; + desktopName = "lsd2dsl"; + genericName = "lsd2dsl"; + comment = meta.description; + categories = "Dictionary;FileTools;Qt;"; + }); + installPhase = '' install -Dm755 console/lsd2dsl gui/lsd2dsl-qtgui -t $out/bin '' + lib.optionalString stdenv.isDarwin '' @@ -33,6 +43,6 @@ mkDerivation rec { ''; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix b/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix index ef80236148..d711f43ad5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix @@ -1,34 +1,34 @@ { lib, stdenv, fetchFromGitHub, cmake, perl , alsa-lib, libevdev, libopus, udev, SDL2 , ffmpeg, pkg-config, xorg, libvdpau, libpulseaudio, libcec -, curl, expat, avahi, enet, libuuid, libva +, curl, expat, avahi, libuuid, libva }: stdenv.mkDerivation rec { pname = "moonlight-embedded"; - version = "2.4.11"; + version = "2.5.1"; src = fetchFromGitHub { - owner = "irtimmer"; + owner = "moonlight-stream"; repo = "moonlight-embedded"; rev = "v${version}"; - sha256 = "19wm4gizj8q6j4jwqfcn3bkhms97d8afwxmqjmjnqqxzpd2gxc16"; + sha256 = "0wn6yjpqyjv52278xsx1ivnqrwca4fnk09a01fwzk4adpry1q9ck"; fetchSubmodules = true; }; outputs = [ "out" "man" ]; - nativeBuildInputs = [ cmake perl ]; + nativeBuildInputs = [ cmake perl pkg-config ]; buildInputs = [ alsa-lib libevdev libopus udev SDL2 - ffmpeg pkg-config xorg.libxcb libvdpau libpulseaudio libcec - xorg.libpthreadstubs curl expat avahi enet libuuid libva + ffmpeg xorg.libxcb libvdpau libpulseaudio libcec + xorg.libpthreadstubs curl expat avahi libuuid libva ]; meta = with lib; { description = "Open source implementation of NVIDIA's GameStream"; - homepage = "https://github.com/irtimmer/moonlight-embedded"; - license = licenses.gpl3; + homepage = "https://github.com/moonlight-stream/moonlight-embedded"; + license = licenses.gpl3Plus; maintainers = [ maintainers.globin ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix index 8cf8d8286a..298307b58f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wcOF34GzlB6YKISkjDgYgsaN1NmWBMIntfT23A6byx8="; + sha256 = "sha256-umVIMboKG6cZ1JOcfhOEZTQwPLxC2LdlGUa4U6LXh/g="; }; - cargoSha256 = "sha256-aW1VliL7QQm9gMeM6N+SroHlgqI3F7MX0EzcuEzcJnQ="; + cargoSha256 = "sha256-nppwwO0dBXYG/ZJMNWGnl7J77GDI7+NV8QAmfcbpJD4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix index 6aa1099c35..534f6adecd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pwsafe"; - version = "3.55.0"; + version = "3.56.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-+Vfwz8xGmSzFNdiN5XYkRqGmFuBVIgexXdH3B+XYY3o="; + sha256 = "sha256-ZLX/3cs1cdia5+32QEwE6q3V0uFNkkmiIGboKW6Xej8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/surface-control/default.nix b/third_party/nixpkgs/pkgs/applications/misc/surface-control/default.nix index d78904f598..e4b354845d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/surface-control/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/surface-control/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { "Control various aspects of Microsoft Surface devices on Linux from the Command-Line"; homepage = "https://github.com/linux-surface/surface-control"; license = licenses.mit; - maintainers = with maintainers; [ winterqt ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix index 5c32d8622e..a591a766e1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.10.4"; + version = "0.13.29"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "1rs6xpnmqzp45jkdzi8x06i8764gk7zl86sp6s0hiirbfqf7vwsy"; + sha256 = "sha256-56+/WQESbf31UkJU4xONLY2T+WQVM0bI/x1yLZr3elI="; }; # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "1c9vw1n6h7irwim1zf3mr0g520jnlvfqdy7y9v9g9xpkvbjr7ich"; + cargoSha256 = "sha256-8am66wP2751AAMbWDBKZ89mAgr2poq3CU+aJF+I8/fs="; meta = with lib; { description = "A terminal user interface for taskwarrior "; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix index a3e2dc11c6..8e70a70423 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix @@ -16,9 +16,9 @@ buildGoModule rec { vendorSha256 = "sha256-XBfTVd3X3IDxLCAaNnijf6E5bw+AZ94UdOG9w7BOdBU="; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X github.com/achannarasappa/ticker/cmd.Version=v${version}") - ''; + ldflags = [ + "-s" "-w" "-X github.com/achannarasappa/ticker/cmd.Version=v${version}" + ]; # Tests require internet doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix index 847b95c787..308fbff126 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "tint2"; - version = "17.0"; + version = "17.0.1"; src = fetchFromGitLab { owner = "o9000"; repo = "tint2"; rev = version; - sha256 = "1gy5kki7vqrj43yl47cw5jqwmj45f7a8ppabd5q5p1gh91j7klgm"; + sha256 = "sha256-yiXdG0qYcdol2pA1L9ii4XiLZyyUAl8/EJop48OLoXs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/vym/default.nix b/third_party/nixpkgs/pkgs/applications/misc/vym/default.nix index 9d820fc4da..c3941e0b1b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/vym/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/vym/default.nix @@ -39,8 +39,6 @@ mkDerivation rec { install -Dm755 -t $out/share/man/man1 doc/*.1.gz ''; - dontGzipMan = true; - meta = with lib; { description = "A mind-mapping software"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix index 88f0e13e91..a38c1002a0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { "-Dman-pages=enabled" ]; - preFixup = lib.optional withMediaPlayer '' + preFixup = lib.optionalString withMediaPlayer '' cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py wrapProgram $out/bin/waybar-mediaplayer.py \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/wmname/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wmname/default.nix index d501869770..cb4f5ec344 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wmname/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wmname/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 ]; - preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ]; + preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk''; meta = { description = "Prints or set the window manager name property of the root window"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 05f6c2b6a6..0da75d323f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { - version = "0.3.6"; + version = "0.3.7"; pname = "zathura-pdf-mupdf"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "1r3v37k9fl2rxipvacgxr36llywvy7n20a25h3ajlyk70697sa66"; + sha256 = "07d2ds9yqfrl20z3yfgc55vwg10mwmcg2yvpr4j66jjd5mlal01g"; }; nativeBuildInputs = [ meson ninja 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 924b9a7fb8..fe7cfb6c7b 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.28.105"; + version = "1.28.106"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "1E2KWG5vHYBuph6Pv9J6FBOsUpegx4Ix/H99ZQ/x4zI="; + sha256 = "gr8d5Dh6ZHb2kThVOA61BoGo64MB77qF7ualUY2RRq0="; }; dontConfigure = true; 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 6f08f644b2..64f951141a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -169,9 +169,9 @@ let ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: ./patches/widevine-79.patch + ] ++ lib.optionals (versionRange "91" "94") [ # 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") [ # Required as dependency for the next patch: (githubPatch { # Reland "Reland "Linux sandbox syscall broker: use struct kernel_stat"" 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 641742b967..8a0dc4eee5 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 @@ -18,9 +18,9 @@ } }, "beta": { - "version": "93.0.4577.42", - "sha256": "180lywcimhlcwbxmn37814hd96bqnqrp3whbzv6ln3hwca2da4hl", - "sha256bin64": "19px9h9vf9p2ipirv8ryaxvhfkls0nfiw7jz1d4h61r3r6ay5fc4", + "version": "93.0.4577.51", + "sha256": "0b3mx5ns4pbrwc7s2iz8ffv8lhay6p9gj0dnsd1qzxgqwgrv37h5", + "sha256bin64": "1b8ypv14c5ky789dm17czv4yf7v21lwhnf2ygkdzryvd3i056nsz", "deps": { "gn": { "version": "2021-07-08", @@ -31,15 +31,15 @@ } }, "dev": { - "version": "94.0.4603.0", - "sha256": "1mhb7y7mhjbi5m79izcqvc6pjmgxvlk9vvr273k29gr2zq2m2fv3", - "sha256bin64": "1rqprc2vkyygwwwjk25xa2av30bqbx5dzs6nwhnzsdqwic5wdbbz", + "version": "94.0.4606.12", + "sha256": "1yv34wahg1f0l35kvlm3x17wvqdg8yyzmjj6naz2lnl5qai89zr8", + "sha256bin64": "19z9yzj6ig5ym8f9zzs8b4yixkspc0x62sz526r39803pbgs7s7i", "deps": { "gn": { - "version": "2021-07-31", + "version": "2021-08-11", "url": "https://gn.googlesource.com/gn", - "rev": "eea3906f0e2a8d3622080127d2005ff214d51383", - "sha256": "1wc969jrivb502c45wdcbgh0c5888nqxla05is9bimkrk9rqppw3" + "rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263", + "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" } } }, diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix index 61d304becf..34cc5bb916 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -75,6 +75,10 @@ let suffix = if channel != "stable" then "-" + channel else ""; + crashpadHandlerBinary = if lib.versionAtLeast version "94" + then "chrome_crashpad_handler" + else "crashpad_handler"; + in stdenv.mkDerivation { inherit version; @@ -146,7 +150,7 @@ in stdenv.mkDerivation { --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --add-flags ${escapeShellArg commandLineArgs} - for elf in $out/share/google/$appname/{chrome,chrome-sandbox,crashpad_handler,nacl_helper}; do + for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary},nacl_helper}; do patchelf --set-rpath $rpath $elf patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf done diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix index 2cd3ee11d2..70adae5d09 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix @@ -52,14 +52,14 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.3.0"; + version = "29.4.0.1"; src = fetchFromGitHub { githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "1q0w1ffmdfk22df4p2ks4n55zmz44ir8fbcdn5a5h4ihy73nf6xp"; + sha256 = "1qzsryhlxvh9xx9j7s4dmxv575z13wdx8iigj8r0pdmg5kx6rpkb"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index ca57c27ba5..ac063cb1a6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -88,19 +88,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.5.2"; + version = "10.5.5"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "16zk7d0sxm2j00vb002mjj38wxcxxlahnfdb9lmkmkfms9p9xfkb"; + sha256 = "0847lib2z21fgb7x5szwvprc77fhdpmp4z5d6n1sk6d40dd34spn"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "0xc3ac2y9xf7ff3pqrp5n6l9j8i5hk3y2y3zwykwhnycnfi6dfv4"; + sha256 = "0i26fb0r234nrwnvb2c9vk9yn869qghq0n4qlm1d7mr62dy6prxa"; }; }; in 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 d136873866..6477f4fbe0 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.1.2369.18-1"; + version = "4.1.2369.21-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "062zh7a4mr52h9m09dnqrdc48ajnkq887kcbcvzcd20wsnvivi48"; + sha256 = "03062mik6paqp219jz420jsg762jjrfxmj1daq129z2zgzq0qr8l"; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix index 2354a41a6a..90105b1c4e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "6.4.4"; + version = "6.4.5"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-N7GrxePNewxhHnkQP/XBdUIEL5FsFD4avouZaIO+BKc="; + sha256 = "sha256-/1JRje7SNrIsb3V1tq5ZW5zsURaQUzM/Jp3TMR0MfKw="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix new file mode 100644 index 0000000000..1ee8f31ed8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "cilium-cli"; + version = "0.8.6"; + + src = fetchFromGitHub { + owner = "cilium"; + repo = pname; + rev = "v${version}"; + sha256 = "07p62zifycw7gnwkd3230jsjns80k2q9fbj8drzp84s9cp7ddpa9"; + }; + + vendorSha256 = null; + + meta = with lib; { + description = "CLI to install, manage & troubleshoot Kubernetes clusters running Cilium"; + license = licenses.asl20; + homepage = "https://www.cilium.io/"; + maintainers = with maintainers; [ humancalico ]; + mainProgram = "cilium"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index a251886ebd..287640bf5a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "7.2.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "0cf5vshyz6j70sv7x43r1404hdcmkzxgdb7514kjilp5z6wsr1nv"; + sha256 = "sha256-I+4tFAMmmsmi5WH9WKXIja1vVWsPHNGkWbvjWGUCmkU="; }; # vendor directory stale deleteVendor = true; - vendorSha256 = "0p0s0dr7kpmmnim4fps62vj4zki2qxxdq5ww0fzrf1372xbl4kp2"; + vendorSha256 = null; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix index 3c0b97f0ba..0b862718cf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "0.9.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "sha256-n+OtFXgFmW0xsGEtC6ua0qjdsJSbEjn08mAl5Z51Kp8="; + sha256 = "sha256-RcDZW/iOAcJodGiuzmeZk3obtD0/mQoMF9vL0xNehbQ="; }; vendorSha256 = null; @@ -32,7 +32,6 @@ buildGoModule rec { "plugins/main/vlan" "plugins/meta/bandwidth" "plugins/meta/firewall" - "plugins/meta/flannel" "plugins/meta/portmap" "plugins/meta/sbr" "plugins/meta/tuning" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/dnsname-cni/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/dnsname-cni/default.nix index c14033382b..a0bc37f2cd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/dnsname-cni/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/dnsname-cni/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "cni-plugin-dnsname"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "containers"; repo = "dnsname"; rev = "v${version}"; - sha256 = "sha256-hHkQOHDso92gXFCz40iQ7j2cHTEAMsaeW8MCJV2Otqo="; + sha256 = "sha256-kebN1OLMOrBKBz4aBV0VYm+LmLm6S0mKnVgG2u5I+d4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/xhyve.nix index 8c3534006b..86a7d87a0e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/xhyve.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/xhyve.nix @@ -17,7 +17,7 @@ buildGoPackage rec { export CGO_CFLAGS=-I$(pwd)/go/src/${goPackagePath}/vendor/github.com/jceel/lib9p export CGO_LDFLAGS=$(pwd)/go/src/${goPackagePath}/vendor/build/lib9p/lib9p.a ''; - buildFlags = "--tags lib9p"; + tags = [ "lib9p" ]; src = fetchFromGitHub { rev = "v${version}"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/wrapper.nix index b912e9abe5..b932229092 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/wrapper.nix @@ -23,8 +23,7 @@ in # Remove the symlinks created by symlinkJoin which we need to perform # extra actions upon postBuild = '' - rm $out/bin/helm - makeWrapper "${helm}/bin/helm" "$out/bin/helm" "--argv0" "$0" \ + wrapProgram "$out/bin/helm" \ "--set" "HELM_PLUGINS" "${pluginsDir}" ${extraMakeWrapperArgs} ''; paths = [ helm pluginsDir ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix index e565657a5c..3652405194 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix @@ -17,10 +17,10 @@ buildGoModule rec { excludedPackages = "\\(tools\\|docgen\\)"; - preBuild = let t = "github.com/rancher/k3d/v4/version"; in - '' - buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.K3sVersion=v${k3sVersion}") - ''; + ldflags = let t = "github.com/rancher/k3d/v4/version"; in + [ + "-s" "-w" "-X ${t}.Version=v${version}" "-X ${t}.K3sVersion=v${k3sVersion}" + ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix index 5784c2a472..eb29cba7de 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { subPackages = ["cmd"]; - preBuild = '' - export buildFlagsArray+=("-ldflags=-X main.kubeBuilderVersion=v${version} \ - -X main.goos=$GOOS \ - -X main.goarch=$GOARCH \ - -X main.gitCommit=v${version} \ - -X main.buildDate=v${version}") - ''; + ldflags = [ + "-X main.kubeBuilderVersion=v${version}" + "-X main.goos=${go.GOOS}" + "-X main.goarch=${go.GOARCH}" + "-X main.gitCommit=v${version}" + "-X main.buildDate=v${version}" + ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix index 4909d734ff..344bf7c82d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uYiGerxZb5GW1dOcflERF3wvgJ8VOtRmQkyzC/ztwjk="; + sha256 = "sha256-r9VJQUmwe4UGCLmzxG2t9XHQ7KUeJxmEuAwxssPArcM="; }; - vendorSha256 = "sha256-kGSibuXutyOvDkmajIQ0AqrwR3VUiWoM1Y2zk3MwwyU="; + vendorSha256 = "sha256-KnXxp/6L09a34cnv4h7vpPhNO6EGmeEC6c1ydyYXkxU="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix index 7dc1a3c7d9..9679f5bd2e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix @@ -13,9 +13,9 @@ buildGoModule rec { vendorSha256 = "sha256-EM0lPwwWJuLD+aqZWshz1ILaeEtUU4wJ0Puwv1Ikgf4="; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w") - ''; + ldflags = [ + "-s" "-w" + ]; meta = with lib; { homepage = "https://github.com/aquasecurity/starboard-octant-plugin"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix index 7bcd905c99..6f8e564053 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "qbec"; - version = "0.14.2"; + version = "0.14.6"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "sha256-F5xnW9069Xrl6isvmeYtfTZUZSiSq47HLs5/p3HCf6E="; + sha256 = "sha256-zsabEYmbWW6lwqyqpPIgCmA4PE6F5Byb8KT/PlLSlvY="; }; - vendorSha256 = "sha256-wtpXqIixjRYYSIPe43Q5627g6mu05WdvwCi9cXVgCBs="; + vendorSha256 = "sha256-VOBRQJzATaY9DNRhZvYTRpoISikbzUAwS/1hUfce/44="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix index 8f4324f434..fc30699f22 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub }: # SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags. -let rev = "f6e19140201d6bf2f1274bf6567087bc25154210"; +let rev = "981a3ffd4368600eb1a5bca3f12a251e80895d37"; in buildGoModule rec { pname = "sonobuoy"; - version = "0.50.0"; # Do not forget to update `rev` above + version = "0.53.2"; # Do not forget to update `rev` above buildFlagsArray = let t = "github.com/vmware-tanzu/sonobuoy"; @@ -17,13 +17,13 @@ buildGoModule rec { ''; src = fetchFromGitHub { - sha256 = "sha256-LhprsDlWZjNRE6pu7V9WBszy/+bNpn5KoRopIoWvdsg="; + sha256 = "sha256-8bUZsknG1Z2TKWwtuJtnauK8ibikGphl3oiLXT3PZzY="; rev = "v${version}"; repo = "sonobuoy"; owner = "vmware-tanzu"; }; - vendorSha256 = "sha256-0Vx74nz0djJB12UPybo2Z8KVpSyKHuKPFymh/Rlpv88="; + vendorSha256 = "sha256-Lkwv95BZa7nFEXk1KcwXIRVpj9DZmqnWjkdrZkO/k24="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix index d92518c0b4..066b70e8e2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix @@ -16,9 +16,9 @@ buildGoModule rec { # Don't build and check the integration tests excludedPackages = "itest"; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version}") - ''; + ldflags = [ + "-s" "-w" "-X main.version=v${version}" + ]; preCheck = '' # Remove test that requires networking diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix index 09851e67ab..602ac8ae53 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix @@ -4,16 +4,16 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in buildGoModule rec { pname = "stern"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-jgmURvc1did3YgtqWlAzFbWxc3jHHylOfCVOLeAC7V8="; + sha256 = "sha256-y8FkQBZHg4LYC8CmwQSg2oZjIrlY30tL/OkfnT+XsMM="; }; - vendorSha256 = "sha256-p8WoFDwABXcO54WKP5bszoht2JdjHlRJjbG8cMyNo6A="; + vendorSha256 = "sha256-217OKXT072hpq4a6JEev4rSR8uUoPdDbOR7KUkhpM9E="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index 9bc10753a8..e230313f05 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -195,9 +195,9 @@ rec { }; terraform_1_0 = mkTerraform { - version = "1.0.4"; - sha256 = "09g0ln247scv8mj40gxhkij0li62v0rjm2bsgmvl953aj7g3dlh1"; - vendorSha256 = "07pzqvf9lwgc1fadmyam5hn7arlvzrjsplls445738jpn61854gg"; + version = "1.0.5"; + sha256 = "0nhxrlnwg76iiqs9hj6ls54176df78ys3356nxmd9ip8jx9ix47v"; + vendorSha256 = "08fvp6w8xsv42jjgpr73kyah20g3979rf84ysrq5whvfmrbpzm2f"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 66e80f6648..dba9ff4ae7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.31.3"; + version = "0.31.5"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-I7S7B+mQxLdMWiLAkUIW39kXGU9k647OOhHysYotkfU="; + sha256 = "sha256-yovrqDGvw+GwzEiuveO2eLnP7mVVY5CQB0agzxIsHto="; }; vendorSha256 = "sha256-CVWg2SvRO//xye05G3svGeqgaTKdRcoERrR7Tp0JZUo="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix index 3d726eba98..edf467d512 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix @@ -1,16 +1,22 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.1.133"; + version = "3.1.135"; - src = python3Packages.fetchPypi { - pname = "FlexGet"; - inherit version; - sha256 = "1mfmy2nbxx9k6hnhwxpf2062rwspigfhbvkpr161grd5amcs2cr6"; + # Fetch from GitHub in order to use `requirements.in` + src = fetchFromGitHub { + owner = "flexget"; + repo = "flexget"; + rev = "v${version}"; + sha256 = "01qj9pp3b7qxpv1yzak4ql1d95dq6611crpp4y5z44mg5gmbql7g"; }; postPatch = '' + # Symlink requirements.in because upstream uses `pip-compile` which yields + # python-version dependent requirements + ln -sf requirements.in requirements.txt + # remove dependency constraints sed 's/==\([0-9]\.\?\)\+//' -i requirements.txt 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 9b58931eed..3f4ba56f5d 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 @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.13.1"; # Please backport all updates to the stable channel. + version = "5.14.0"; # 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: @@ -35,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 = "0k3gbs6y19vri5n087wc6fdhydkis3h6rhxd3w1j9rhrb5fxjv3q"; + sha256 = "0rb7ixha07v0l3bm9jbgnlf78l9hhjc9acyd1aji9l4fpq3azbq1"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix index 7b2b29033f..624d3240c4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -83,8 +83,6 @@ stdenv.mkDerivation rec { moveToOutput bin/notmuch-emacs-mua $emacs ''; - dontGzipMan = true; # already compressed - passthru = { pythonSourceRoot = "notmuch-${version}/bindings/python"; inherit version; 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 7a656c9505..35ef5ea25b 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,655 +1,655 @@ { - version = "91.0"; + version = "91.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/af/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/af/thunderbird-91.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "6fb57813f9f0568f3f97aa512c9b94df540e4e2aebdadb11994237bdf167a929"; + sha256 = "c2aabfe9a1ff2a196d08f80ca89468523edbcda6e756449cc1f4ae765b7dce62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ar/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/ar/thunderbird-91.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "398ac9528f19d2457689eb0d4579cfaeb21fe7d0be4a40a66a4216fd6d1e5f16"; + sha256 = "c9cd4f45a70761e00e877108c53c504305075bba03c9ec0a8cc3324757c66547"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ast/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/ast/thunderbird-91.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "2ac99b80f8ba4f36406fc9df3eaf6f9290f89a23e99736820b5e9fdc14b549ab"; + sha256 = "2a531361709c5e0aab20f28b6edc6e58d4b1612c295320dbe903d8d5ada70004"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/be/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/be/thunderbird-91.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "0088a693289b0cdfb441837843dc0342d772c8e0f5d57dd68b620b18e7cc7be5"; + sha256 = "4e2db1f6b4370e7a7a070ab3849141f8bea6b9f6497b17efca97377afe2cccd2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/bg/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/bg/thunderbird-91.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "ee23796c539b5c118d39a6dcfd3ebb3b3e9c2f0720a45eb920e782e7a43ded14"; + sha256 = "f6056f71b0b3c7b9e54b232133e11e142c31085c3d0af97c23ea656569078688"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/br/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/br/thunderbird-91.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "5bf147164fbf9dbe3dbe5eba6c4ba81438870da10a6c0e71606ed95a333fcfba"; + sha256 = "1b07f6a0f32a6c823f7a1631085e2b4a98f3486d70423b617fd10602b3670d63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ca/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/ca/thunderbird-91.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "a1cab93e6e8c3c22ba65364dfabc39a0fa7fb0c6c35b002036068c894d68a093"; + sha256 = "f41afd9a8e9a5bd2dff04f5ec886112dd8385f89c633960163b8c689ba692bcb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/cak/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/cak/thunderbird-91.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "9b51ed781b637f417a230901b05018a5a69bbdfee98d1100140bf8e7e1aa8992"; + sha256 = "9a10f87df261a5a67b240e687879801bfb9ee2e367f599155fd24cf12cc53393"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/cs/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/cs/thunderbird-91.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "3384ec93657fb7e93bebb010d24edac3dcda240d87dc3c9be3918a8d559e9e3a"; + sha256 = "8c2e5aba275ecf5c3e769c56567ba1567006945c45be09f35688cf83b95136b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/cy/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/cy/thunderbird-91.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "e2e8a9adafc1038872264bedb76a702217502738304a790f887b5cd326c0e58c"; + sha256 = "d56388d698bc38e40d68736cf9b4c2bc81d6112ae356397769f95205dacbbfa5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/da/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/da/thunderbird-91.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "40a63673b7f3d2cd68758476448b181e1ef1b0ede3dc1031938bf91cb261ba17"; + sha256 = "717f1599219ebd72b78fbd94526aa20bbf8d107b164b50de01ec529750db11ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/de/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/de/thunderbird-91.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "4244dbfae753f96287e576680ef8dc9767bcfa1c1ceec68e58580e03d0ef7587"; + sha256 = "ce210eaa9bd17bd97283c28935e2cc06c2120cc0a725e9777749c1c1d4c24d86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/dsb/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/dsb/thunderbird-91.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "3ba7f369886303bff8ab524218ab588dd6521a3c2d2fb98c857dba69992c7352"; + sha256 = "6e955a2cae9078f72640bb06e60d1b6cbdf6e67f2f2881ecc8dd827ea74d188e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/el/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/el/thunderbird-91.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "d8af9b00e7b27be272b22381dcf5dee91acbabee3113a909cd0f12143ced9ce0"; + sha256 = "c2e71c09b69122bd5e6d2dd5008fd8e3d4f3dc7f17edf4964d1b0fa3ba47faf9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/en-CA/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/en-CA/thunderbird-91.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "de8a4a8be9dbf3aedfad1ea8fda7aa14758923d232148f96f1ee356781e87b4f"; + sha256 = "a23bffa53f9a1ec2812e367927463d2698386e3e2a74f47f352d81786c05541d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/en-GB/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/en-GB/thunderbird-91.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "b76b69cd6d10ff0140da9c53b35842f04b798235427f5a058d9911e111e1c73c"; + sha256 = "ec5b334d4976ed46d30095c3e906eadd50d19c433c77446edc0cd0583175126f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/en-US/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/en-US/thunderbird-91.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "74776e073932dc77d24bf8967b6ff09052c3be7f8b78d82fd4684ed395f633e4"; + sha256 = "c9ff70d202311fb5347b87d67e2ecfe9904b579d8e94dd94369d67166408e1f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/es-AR/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/es-AR/thunderbird-91.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "449d7b060da5f95b8605a49f1ee12e6633b3bd1b3b96a50837fc641e558331b0"; + sha256 = "fbba20795ae5b650adde2d6e93d7ca734bdb76a4948304b4968cec97fcecdc1e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/es-ES/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/es-ES/thunderbird-91.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "b18e38da156c4242a5108eede2c8cdf236d48561175d842fe54b5dcde2ccfbb6"; + sha256 = "09ffb1a1013bc9392341e4d4a3df190820f6a99828d155e24d7817ca8bebda12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/et/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/et/thunderbird-91.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "96eae79eec62e2661f01424e4a6363c4f541a22cb47bf8d674606553bcf367fd"; + sha256 = "3feeabfa2ee1f8bb9e236594b7294fd841cf639a47b6b78070ef64acd35cd508"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/eu/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/eu/thunderbird-91.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "68db1e219d0cda1f67ac7f6b4f1de727e1dc2c11bfc705a16f83710b0d265c0b"; + sha256 = "2532b2609c02289d24f331f4e34898b18b426b5cf4f262c3e1e8d6a6b301ef24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/fi/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/fi/thunderbird-91.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "90edac8bbac821f7d286ee24042c6b2e993606ea7457b9b132b0e591744d8448"; + sha256 = "459fa042c920d3917ea13ac03c9d5560319c2d0b2851e0ad1e99d401a53e9bc9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/fr/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/fr/thunderbird-91.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "abf6c364d18fdd015654f6179be07ff701a3dfac2fcd028a5eeb6b0171da584c"; + sha256 = "c48b5552c8ce8a51fe0222c7c1357319691f526e30bdff962d852cace77bf5bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/fy-NL/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/fy-NL/thunderbird-91.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "dc3226237442171bf23f0781ed9be5fe77fe89514dff0155a34ae224a9109132"; + sha256 = "cd5b787a6de8106a3e6cb8a99992ab163e0a7e10fe847eec48e427ba8398c21c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ga-IE/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/ga-IE/thunderbird-91.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "1808e5d949005b3adc4ed40f5ed0ad5350a7c6e8e5692347b07bb7db3eb2e85a"; + sha256 = "2ad66f5db3c1c10ea7f18c1c1693860fb355d696817973fe35133df98048fe1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/gd/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/gd/thunderbird-91.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "93592836614498d617d60aa0799957371c63747029343836da5f1afaa415cd96"; + sha256 = "87c6c0c7151dda09d007ac0fb49ed3bfa9eb463b85f98f057e1733d19048573b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/gl/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/gl/thunderbird-91.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "917a816447dbc5381b14ca18331a8979aaf65c8b593376ae1dfc5a53953f6150"; + sha256 = "5fc8b2adfbe204a64043983dad1da17eda77dfd89e18c20946d533884c2669f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/he/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/he/thunderbird-91.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "85a78253b374a4134021ff5d8bf3b8146fd864ce5cd40d60668e9130f8ff915c"; + sha256 = "81d7d3eca6e87ac41b96634484fa38ea1d130165b9b4df5f3170d124ea2e3a17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/hr/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/hr/thunderbird-91.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "38c912e4ab89f49caaea46da01c3042764a859e541f749f94737ccd85594aaa7"; + sha256 = "86fee237f65ac8a86c7db9aa490c82b6ed5031557ae2c11eff95523405148484"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/hsb/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/hsb/thunderbird-91.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "b3e51840364ac97b080008fd1dc65af8ba8f827bf3867d182b0486448c118877"; + sha256 = "cdae048500f27f7a0f7922f9299435a2b329bf1304e8bfe3e12298998172539c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/hu/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/hu/thunderbird-91.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "4b8e82e5726de6ce682b7e0192adb013f036dd9cd6745afc4e227074fee69ebe"; + sha256 = "ce0460af38a61924ad66a96473358941614181cb00bad714ce91f0ab9ccab09b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/hy-AM/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/hy-AM/thunderbird-91.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "43d70569709895d1ab015dc7f7f984cef05b100b360285ab51bfaef38ed41b3e"; + sha256 = "d76bb56d05efbdf9bb8843a9c6991ef2d016a97193cc919a5fc2042a12c76da1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/id/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/id/thunderbird-91.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "11b1a3d2f12ffef1bb434b428ae60a5c40cf7f90186d3b0e301c8422731f9959"; + sha256 = "71c1ca210af2b1834363afbcd4ffbcdd592ef71296b5c0abffe8004e09f7587d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/is/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/is/thunderbird-91.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "8a62b5defb2abfa1a3f37c1a0fbd890fb650aedb565da97b47def80bc7ef4349"; + sha256 = "02c91f3b4cc45e053637c574a4859fdf7b6e663ad09974153b3782d795aea907"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/it/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/it/thunderbird-91.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "160440d4f5bbd1d305a3de2096847a692b155a8c4da2b5e1273b2ff2a9595a1b"; + sha256 = "8f69e3f7cf6d9f8acfd01e54f464e570fcc8bf0180e8b038c5afb75a42db0726"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ja/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/ja/thunderbird-91.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "69ed5d8fb0822991511e70487a90f0b564d84b1f5774bbf493d2b128c49f5852"; + sha256 = "328748e49b4ae488902bb652c47c8bf7accc87384989177ded8e794d0c6b5a9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ka/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/ka/thunderbird-91.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "b536d8b558296a04b6ce5cee4accca28b286ded4046f6b47f5725f79551947d6"; + sha256 = "07d565d2d43de3b3dcfd278302bcb9ac84f811cb643e2f48bfe33e155ecf77fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/kab/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/kab/thunderbird-91.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "3ff28c944d78bba5cdca8f859baa9d142e7e26f2cf31a6d3de3e38c9af4ca6af"; + sha256 = "d82d24903e71a45597072cb19e53e22315d48145474dab7cb280fbb659ea4e2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/kk/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/kk/thunderbird-91.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ae412956e8acfb68c4a36f912940e8b8faa9d3e1240982aea9fd01ec1d86f273"; + sha256 = "dfce35caf926d33dff1f9728d1f051ffb215f5be87872102e810fb7cba40ce39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ko/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/ko/thunderbird-91.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a51368f6ac4efe83873d2e8208aa17b0fc8887c8d6f605ac910ad72a7f4c411c"; + sha256 = "eb990e826852398185849c07a0656eb5d848bbd827debcffb4db54e7cb78de26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/lt/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/lt/thunderbird-91.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "a22d65720566d38eaa75944001d5f077ee3df3787e8b4b5220609f819474c6e4"; + sha256 = "20b01c81284e89fcc3d4172a3c57ca7820ebfcd40b4dbe1c9ec5dc4119eddc50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/lv/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/lv/thunderbird-91.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ec05e9a802dc01349d5226eeb88dbbc980c867cb037404c46e2535587463465d"; + sha256 = "1cad6e5d796ff39af0d94008969439dd9bc2308f66fe23b275ecd9a11ce1d00f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ms/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/ms/thunderbird-91.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "540d7f9530515abf49909b4dce562d25f679d2e41e5871b3f8d76410ef6527fb"; + sha256 = "f6e5e90dbac60ad84ad4be6d69d12607711a95521e617933d6615d761e4636c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/nb-NO/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/nb-NO/thunderbird-91.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "e4a6790bca7720bbf44bdd7e9dfbdc7b229a536f3054ff497917b60484095bfb"; + sha256 = "3b2666b1a633e291e9e52dd10c381b89415de8d3994030f3db05f7a656872d5f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/nl/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/nl/thunderbird-91.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "0f0a6ceef0a0e8a9bc05f3bf948a635a05073dc4b7750788ac94ef0ca600fe96"; + sha256 = "b1064d31f9e9757eb4a988da31128de40a50d2061c2bb96138e00ce20903017f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/nn-NO/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/nn-NO/thunderbird-91.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "f13232443a5b5d89c971a07e6867ab8874dbd1fc090e9f5126af1fc3641183ff"; + sha256 = "6eca782596910cb9f340aa5640e46552054e4beb014bcdd3dc286683570a908f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/pa-IN/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/pa-IN/thunderbird-91.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "a5ff0f2bbc3f1dc52394e3f6c28538af4caf23e9b7b58b9eea07f1df16a2c7ec"; + sha256 = "c1e03c9a276267c7f15a4e39cb608f76bd6825363cff934e4b30da09f9c1c978"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/pl/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/pl/thunderbird-91.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "17326bf010c05bc718bf01f9d080c8b9987ca249809244751a87424d88ac744c"; + sha256 = "4e07473e2c1cba237f1b01721943b1275282b05dcb608c74bc957d64fdba4c78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/pt-BR/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/pt-BR/thunderbird-91.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "dc82c57f2577ba459aa90f8394f03944c9322b40ac84d0fa9023334932888b8b"; + sha256 = "81be1b2651211fc8701e6ed9733e9e0e4ccc0898cf1da767ef1589ee870dc63d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/pt-PT/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/pt-PT/thunderbird-91.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "706e80a83dcd92c32b85da31f5c5e304342ef4f3723bfc45e8a8c0f5b415950d"; + sha256 = "39f240a740ddb979d62b0ed75f1120895e16e8bed22c6c4308865ee07545401d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/rm/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/rm/thunderbird-91.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "0f616312c7e92e49062df968561096b41f20b0c62283f7647bfc35ec562ed845"; + sha256 = "60211c33985a2e5fd57f266e7c51262cb1cf2b32fd885f9b56886f02b1d67b31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ro/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/ro/thunderbird-91.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "b61faa886fd34207c4453adbab6e3a83cb45b6ff204ad52d55e9bed591922b13"; + sha256 = "90e354dc8e195dbf4fe7f16ec7837cb53f445794556c5b2f632e77f02be7b824"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ru/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/ru/thunderbird-91.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "8042b28e80dccbb2d130f8eaf6c6c6d27f32072a09e6e037fc2df4ec2b4c8364"; + sha256 = "f03a06814d8e0fc9a741d2cb7aa83646c44052516b8be9b6adffe37d21fa37ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/sk/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/sk/thunderbird-91.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "7810727d8b959ac680163a1a4c8bea093e50a8ec0a4a7b805cbc3629bf60b06a"; + sha256 = "88dc86d35554b8298bb20d15ce4890992b9f7b04f3ad7ff3fcdc7540629ec3b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/sl/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/sl/thunderbird-91.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "fc9173ee213df06ac278ce2ead827f6ee4dfa897b232281db6d804cd49997962"; + sha256 = "26a0f2a73fa73b99f9fc81deb7e4764fd8b8ce062acfef1fd0b8f777365571d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/sq/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/sq/thunderbird-91.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "4447920125210987660b5fcd19c86127242a10dc2449a61d1c68fac7de1a5c5b"; + sha256 = "a4557802a3b7d89cc3594cc1c12d04534543e3bf8825bb28ba176658a3de3fa7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/sr/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/sr/thunderbird-91.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "f88a957406464a5f8827acbfdcd716cd52807da522825e6c815e6f44c8f79691"; + sha256 = "6cbb7f29111f90e4bc42e1e1900b0a17549eb7409846ccf2378d3d8781c2af82"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/sv-SE/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/sv-SE/thunderbird-91.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "71f11757b02eb9b4ab463ddb61ca283e77a7015c38b2cb1a2f3ecd21506369ca"; + sha256 = "d211b1673d1524d27f22334c592a3a9a2b0aaf887467b3dd10359146da4c0cda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/th/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/th/thunderbird-91.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "497b2c6e3af11c9a53f75db9a6765ac810a82a57e771c42126adbe424104444c"; + sha256 = "259af6cce3197e45fb201740e8bc5d50988979626445dc41e9a9152922887c1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/tr/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/tr/thunderbird-91.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "75de22f190e83058c2e85b88ae5d8775328a4257c60d17ef7be20240ffd4c2c2"; + sha256 = "7671dab2bbf6d70170314b07d85120bd77df2892c8d4f6419f4063153d01e721"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/uk/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/uk/thunderbird-91.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "b257f216e2472628c420ed8c09ad98567256ce5d5c89748dbf7562cc2dbbc88a"; + sha256 = "6cb56c07f0ba5ccca171fccf8d95629acdf07fb1f24e2f4795a5b30fe15b3d7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/uz/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/uz/thunderbird-91.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "6af949a5f1632e98013fe4d9254a62f4d3233cc250eded67f45db89faa82a86f"; + sha256 = "35a3df724ee40e4b613a248471abd4b0fa8b4d314681cc96ec746843f3bc2930"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/vi/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/vi/thunderbird-91.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "28d8125827c79822bf24e7e14b71497b1522bac11fb55e9210b7e86066e48f99"; + sha256 = "d99f3fd7afb3d3e210bcc2181d9f43be29be07ad44362c7c9113410bbc84239c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/zh-CN/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/zh-CN/thunderbird-91.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "34d6dcd8e83c5f0ee773b32a3bfdf53bfbef36f3a5a76861e68b5cdd63515dec"; + sha256 = "25f2983548dd324b0194641c0d43ace088626d0ef2e6048ced3d6874a933861d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/zh-TW/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/zh-TW/thunderbird-91.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d67c370be24af901e29833ab4334185186366545d51c4c3c111a4044f199b927"; + sha256 = "7d54efb8587eef38bcfcba9059d5d5429a81a5e808df24a4f33a9ec61483803a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/af/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/af/thunderbird-91.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "0251ce2b251bb2637338618dcd2c083b1b99c4337c04b7cd6757dd28005df405"; + sha256 = "91ceccdf21929d526145f6f71cd21544b83b446d39887d65e6f1419e4ae1e904"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ar/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/ar/thunderbird-91.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "d833ebf9924458b8aac37e1de52b3a043bda6b179365fc896be8306afbdccfcb"; + sha256 = "3bc50c5b718fca792475534488891f8fe7e69320fbd24aae410d2b9121ba4f29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ast/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/ast/thunderbird-91.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "22b051502a38aad41132e05526b4d0e881c9d66e36effaf5c0bb0730a66e4641"; + sha256 = "e9e4faa03141bce539abf86a611c814bab61401711fbe045ae4977db57c83ffb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/be/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/be/thunderbird-91.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ede16ceae207d1c7bfa3bf909879b701c3eac49cb4a7e133a929ee4ee89ae6a4"; + sha256 = "ef5c29de8ac27fc198f00a5f12e0b3824b692c5fcb7bdfc0a3e0aaa08ef4f2a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/bg/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/bg/thunderbird-91.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a1dbe387348c427ddb9948129a2ec1f8aeb34532103def94a086e1b405c532fc"; + sha256 = "b6409a8ff358042f2c6d9258e5d0bf4d341793c91ccb1f088f6a0c376005778a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/br/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/br/thunderbird-91.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "a89b7d357349353d96d608fddb2e2279c5b8a222eab113c56aed7531ccb77848"; + sha256 = "47812c836e816f93c73918f31086ed203b7ea409c916a070749c72e715e0a957"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ca/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/ca/thunderbird-91.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "34086af5fd1b2bf9b603f1379bf7f1ef25583f5021266f2b636853c7d047ba39"; + sha256 = "6257dae22b8b7fb44cd5c4845f44108c06b933c895b401fcc1c02463d3c19c11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/cak/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/cak/thunderbird-91.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "86a8f3938b8dfcd371e043effa0f6a80d2bbdf8046eb5242c8c49f43f27463a9"; + sha256 = "21371bf6103269c2da7dd521297a4472c9bea09019a1916f9bdf0bf42d9ea21e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/cs/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/cs/thunderbird-91.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "4add72a1fd8cd104b30a51ddf5f73e1e66beb5e416a8552f84cc39c815670586"; + sha256 = "4bf27c787004bc06b1d05ec01f3c01040dcd6976e9e1df53aad995c2bbad60c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/cy/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/cy/thunderbird-91.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "539d32830b885ae7790bc9367e45caaa4bd8dcde7328f8b75f6652882aab6533"; + sha256 = "2365ba2da2d6a1bac7a605af7d9e74bb4850c74a74470442aa0e3a03f9a992e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/da/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/da/thunderbird-91.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "ebffd062f2ede3fa1e4659781e44f1905099882e7fe2a994ea283e865bb9926e"; + sha256 = "402f977ad6b04c68cd3f7fbbc60ff9fda188a2e8cb76d3e1c2f206478a4ebb20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/de/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/de/thunderbird-91.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "3f06fb893e22d9b3e27f433c3e8081c9ced29e87492a6b4c4d0660bbfd427579"; + sha256 = "5ca1e16b06986680783dd3dda515992eed8a4e7e9117d32f010b6a8943d7dedc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/dsb/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/dsb/thunderbird-91.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "ff985eb9a3d697fa19d1e803a79e0964607b6803a36b7540b68b37b0ae36b3fb"; + sha256 = "435d258c0bee4489ddc4fe07c1d4c98b35132b3f7bcf4b8239a037100808386e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/el/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/el/thunderbird-91.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "fb463af56b39f8f22d2806174c3a79d3c57f125d88329e3dad14eb448fe21ef5"; + sha256 = "090fd4a515755cec803d642760fc55acd73a2c44fcf93ebd22db7c325ad46cf0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/en-CA/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/en-CA/thunderbird-91.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a86e775b7d271766efccbe851c24fcaa2e2abf45bc6099600f68f90db31a9a38"; + sha256 = "8cbfaa6367ba80c0ec21996bc16cdeeca8fbdba5e6b133b745545026d6545b6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/en-GB/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/en-GB/thunderbird-91.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "ee83c2d28e66acb52aa969380b2be197f14118172e2f9a9a5e683e65e2fbb3f8"; + sha256 = "a9d21dba162b470785c97e084debaad067766210316a3c3a41582c829bd2b961"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/en-US/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/en-US/thunderbird-91.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "a96d6e6fd81b1bcebaa47901a1262b339e07321a47f82be0d913ada978f995b8"; + sha256 = "b0706e6a49d9551b1eb089d915e46d49c35ff787c614937b69e30f6d56f5b503"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/es-AR/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/es-AR/thunderbird-91.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "f7454e9aa448b7f108d4a6f0b74cb943ea7cc5cafe638d7f45ed201bb5e560f4"; + sha256 = "4766e49683ee14859b9e81e2782a18d615140ed902dbbc6e07144831f1525b91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/es-ES/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/es-ES/thunderbird-91.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "d2b2be182440b49b386cd4e4d09e1f4133f3fec08e83fa2ef23ce6de612220be"; + sha256 = "1f46e0e92b79b52dcf36892512b293bfe0aafe80b8c129013aa6415d2d5b8369"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/et/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/et/thunderbird-91.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "4e4580b8dd9c84b7921b420b0d336bb866cd82eb93a06bb73f240cd4324f5ab0"; + sha256 = "d0b1f6fa06a500ff8ae8f014b16111bbf28cf23e0c94f1d6cb83a31a0164b432"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/eu/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/eu/thunderbird-91.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "e2b9a805c5eca39621cbe4927cdd1ecf0582e21fa78d3c27a5df6996fab51cdf"; + sha256 = "e7e7335d1a72611bf10f28267e1cd9c36e84ae785b56615ab66a8f113dffb0bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/fi/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/fi/thunderbird-91.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "1f7a337dda1d3a99e174d5d3b26630238560b30fba9a058575b041e44be15d8d"; + sha256 = "a1cf4319ee4115fc1b96fa937947283ea69f59dcb65fc3b280353629b9955ff1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/fr/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/fr/thunderbird-91.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "1287c936d0f089998484bba6a32d5ee78eb866f7ae0b7bf8eaa832ce1e3796d3"; + sha256 = "cedb9a2597d4fe16706fce0f1dbaf571ff306c29699c4079598d8c20e87e4ee8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/fy-NL/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/fy-NL/thunderbird-91.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "0f88569ae12ac7b3b796d4bd244c242cad29224e2f11aaee7f07b30756b169d8"; + sha256 = "9051c481d79e74253a0f74ae35cb6984daa70892ef6f19643b2ff4d403b62c26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ga-IE/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/ga-IE/thunderbird-91.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "556ee9841a0588de5dad84062d9d908976f46e92e45659b5ebabb7f3b8bf105d"; + sha256 = "13d49e563da0e378f44c49918af7ef84e41e112e2411c56e3c951014ba78b73a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/gd/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/gd/thunderbird-91.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "24059e8f399cfafc0847645a2007c958e015e8977639bae75b5bf0cc9e97b160"; + sha256 = "4b4c76da22ececdbd927e7e3fcbf54a58947c66d982fca03042fc0a91c9a3857"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/gl/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/gl/thunderbird-91.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "600bb0d4c4ad77074511d1bfa80f8f752d18ef06d1a861f604189581dec8011e"; + sha256 = "cd194c3bc4ef9d896dbf1367a96ac18601a7bb446150ffd6c1e3e1c140642196"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/he/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/he/thunderbird-91.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "153e8e37ecca9783f1737e699f36b2cd35524e9d8ef8a57e0f0bfa96fd3ffcf0"; + sha256 = "3a3ebd2554a125cb10e78b4b0ffa8ce0665aa85573c2f4a67801754200ca85e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/hr/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/hr/thunderbird-91.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "aaa099d96c0a05f8b4773483aef740fe125a83b98fe78d73b25cfec35639112a"; + sha256 = "7b80c8839cacf4fa85fdd2630562647356f6608d9652c2651e78301405876054"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/hsb/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/hsb/thunderbird-91.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "2159cabe4a9873ff6d9ca5a12c8e530a027c252f85c9d18c29248223fc402447"; + sha256 = "ddaa6c857cd0fe2c05a229c4da47b33e1bf96d0177b6b228566a0463d5e5cf7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/hu/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/hu/thunderbird-91.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "235a419a02ff897ba82676c2a1a38a274163fc069bb45ef6d49b04b5da575b03"; + sha256 = "48b9e4e51d2340ba0de1167ccd1da4d6de95ffe732a58eb4e30e31a272b1c048"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/hy-AM/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/hy-AM/thunderbird-91.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "f36574058412d452951b789610d7752a4db280a38314d4f1c54a2d7c48ecc32d"; + sha256 = "6955670c2beae55679c55e97a03a2bafd2a389aa990d84a41a58029341f42f74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/id/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/id/thunderbird-91.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "9e0c91956ad10fe0ba944134ef68a0d58631d74a75804d12f3cb1a7e596ff36d"; + sha256 = "8d8b8b9675a400ae4969e89a6b365e6ecbe4c80dcb4da41ea11280dd415d3da2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/is/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/is/thunderbird-91.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "5b06606613bc420769b4071ef2781214c8ab918bb7653594753e655aac49282c"; + sha256 = "39e361fb9bd8097a59b048ed53f6d923c4e17ea597fe6ae0620eff28bfba1b5a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/it/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/it/thunderbird-91.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "b9d3f3e1a03a256a0c4b835d3b93ca220217f8d628ac05513ff161126effa385"; + sha256 = "c0b9f37d53924f91e31660c82992cd9d05878bed08b48c71566cdef4c6cae9eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ja/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/ja/thunderbird-91.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "5ba904085b47370f414d74761394f6ddc71aa3c0fac9cdc023661b70bc708d14"; + sha256 = "faba4c83061f4834b4c1fc5c9895837ccbd0a9727599cb71da918be9825c8e6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ka/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/ka/thunderbird-91.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "9ae8fecd564a1a8e8c6db848e05adc4655baf42e8b4602c28965a3ee76c5d1d2"; + sha256 = "8e4368e366c697e7d78e5bcf100286dd510d940bd89eb6a84712f2281495a201"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/kab/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/kab/thunderbird-91.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a9cde5c6b4c41d0ccfedacd5eeb9f6ef946282cf07bc98c45704bb5f7b4b6210"; + sha256 = "cd5155d346461fc0ccbc468a1dbbba286b922bfb25271005dff4de4b7ae3f299"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/kk/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/kk/thunderbird-91.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "4710e947dcb3bba71d187ad828ad09011183ef104758e7d79c8dbc528f9460fb"; + sha256 = "7d5469688164d896c438541c02e6df9bbc59b804cbdd2ef7bcd68b27959f1336"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ko/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/ko/thunderbird-91.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "1b4d7ce21c95ecd2510bd073bdf74e0d7f748ef69d32adc2eefdb0fae42fd717"; + sha256 = "6b51ea1fdb1d0cb73c82665449da9003b98444a234e06ea3b87be8cd689254c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/lt/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/lt/thunderbird-91.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "ed69b146a789715f51ed78132a4f32c12afae67847faea9629371221e99e4a8a"; + sha256 = "c678002ac4f0353da610a7a208aafa1af80fdafc50811c79140d5f2e4bdb9d23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/lv/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/lv/thunderbird-91.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "6562ae94bd90af19778df1157da2ee39b9da4ae164111c60adae1064400bcefc"; + sha256 = "72bdd8d53008332f579385889c7b55b56814ba369d482d7b86f33059b6a89b82"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ms/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/ms/thunderbird-91.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "812a399146c30e6532eb57597df9a08cce7d769a57df6efd17230db75405be08"; + sha256 = "5e891ea8cd26ec89f41d0ce2e048d05e4f7540ce0ff06ddd1efd6dc00c90daed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/nb-NO/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/nb-NO/thunderbird-91.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "ac5b0231d8bfbc9d318579dd97c3a4e49d723797224cf3f4e1591520ce9c9e07"; + sha256 = "657235b998d47baab559c11f60f4955275eb12875ef4e2d3a225fc5905dc4d48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/nl/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/nl/thunderbird-91.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "fb6f8a3e79ec3c41201ef3595608cbc24c2070baee0a60c2fc489ef391db9fa1"; + sha256 = "eb98cea41e08f1d0ecf79291ba94cf24f2eaaff5c9c47969c2dcec9d22b02c5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/nn-NO/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/nn-NO/thunderbird-91.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "e258d8ae0b1ee94386015168d6ebbe31ddd69c513a9badbe6b6a910e0ef3f6df"; + sha256 = "37f05dc4012f543e46be07a1f27d0eba67df5852008595b77da22d0050225618"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/pa-IN/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/pa-IN/thunderbird-91.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "c96de96b276ddff6f6a9592dd1505df946e8c1dd80a0133c039e6969508e1377"; + sha256 = "80939eb26e7deb62c381ceb9d8a688adc18af5944ca0f31e027ef5d6bfe4f3ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/pl/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/pl/thunderbird-91.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "de159419d5e0123379604cae0e482d8cb3ddd8aa2d879113142e87f809ae3aeb"; + sha256 = "93ad29d7c97d501587bcf333df7bfe0e9692d42269914ffad5217ace78a2cb2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/pt-BR/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/pt-BR/thunderbird-91.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "7b58d79a7710669427076bba99d3d6b32e08643a77f722bdc6b89378c943b497"; + sha256 = "a1ee15db8610e2cd3d21e817291a8fa492d6811fd566ad75b202fb420b0ed4d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/pt-PT/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/pt-PT/thunderbird-91.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "dbbca7893c6d504b493936d1ca364e52da45a71cab69a59ec0352ca68d47b0a7"; + sha256 = "5fb985c57660547e5c22e4e2f31dccf1db140af149bbaf24ec7003c7249ddc71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/rm/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/rm/thunderbird-91.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "98649ae64eb9a8d93f7ecfd699e02e8eae5ac0a2a2e837f0704df7772ed44097"; + sha256 = "acf3cdcd21d10339f6e6e61880a36c9c63f3d5e06aa5742858bfcced8f562094"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ro/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/ro/thunderbird-91.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "479d886c83f53bcb96ea12ddd27f7134fdfa482800337f9c7cef8d8762710839"; + sha256 = "584a892f959800744bdf06e1b181c78b71526f12076b1a299bace0bd96c2a741"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ru/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/ru/thunderbird-91.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "c371992e54bf74571596d4b295a10fb00495017c3e40665e6d3d698d9da03bc4"; + sha256 = "3f24b228ed6caef730dd36c2e22620b7e4b8365de0682017104b57081b1b27ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/sk/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/sk/thunderbird-91.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "95a4e41e6be48bdc4da11864b02d326a85a0dc29faf4acd2297dff03b874e8f7"; + sha256 = "e8c317d088bb6b4ae601e439b45abde1641f152edfc64c1da5f479472c4e027d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/sl/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/sl/thunderbird-91.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "36e702b13f5c3a75625fb0dfc15403438282acda703c372c69f9c865a26baba3"; + sha256 = "9e0d376b0694e7007d889e8d6898bfef68734f52dcbe62ed5b141870ea6fd564"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/sq/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/sq/thunderbird-91.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "0ff2b572ab9751eab4791f960d0f1d4b6658f296251fefb5987b92317c8521e8"; + sha256 = "e2d87bfe4e89d6546e6fc55960426028036574758ddf97e6e039f6a5f7d43c10"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/sr/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/sr/thunderbird-91.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "37798d5093c0f6846984e830fe8a371e7facc2e710874b40774f038aeda7a6ea"; + sha256 = "871274312d5af4f1810017bc49ddccffea6d0b08276bf035ced5a39619c522e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/sv-SE/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/sv-SE/thunderbird-91.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "71e34f95f97ea4cf2e213d60f170ade0de5f199b37ba103ee08b2de568d9af7f"; + sha256 = "d3280b7cc1638057be5edc05bc0f7e76cdd2440e4bd713a8b1da4db0d4f4c119"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/th/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/th/thunderbird-91.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "385b0dc2137c97976d7cb9f49502f13723865071099c97d0cb9b73cac18fe853"; + sha256 = "4b1dd2d7c478bc0fec0d8379b025170ce569e4043b06dc08fbf7a97fda93dc0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/tr/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/tr/thunderbird-91.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "6dd8bb7b49ece0b4b21216bbe4be831bc49c6bcf44d973d5bf4c37372aa6285d"; + sha256 = "3268c493d84db8eb4c8373959548a0828ce66a4b08d7b6f8175c9acabc092a7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/uk/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/uk/thunderbird-91.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "2bd6803f23fc17b9530055e912e2ff6cdc0284f1c656965a88b50d6adee67e08"; + sha256 = "3c3cd733adaa0f61cc489141d6eee89b2efd50b7afd816658cae0f93dfd983a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/uz/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/uz/thunderbird-91.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "72e0727bb25cfc0d73b81cf782d4e37e6d72f0807284c8f057aa220690047185"; + sha256 = "75c7e6e1544b8cd715185a1478a67a7129921fcb45e100e8b707317712fa1b90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/vi/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/vi/thunderbird-91.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "43a6b740ee93cc0ce99ba2d9fb6ddbae1004c53d209bdb3a4b92c5f685d7bf62"; + sha256 = "d1977564fe4bcc3e3d105670f0ceca224437656dfc4f6b1ea23e46348fe0892d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/zh-CN/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/zh-CN/thunderbird-91.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "bdfc475d49cd201f8685fab59e273425741335d7c1f83abce7c79cca45116473"; + sha256 = "11b2079558194aad670fcc38e9a8bf2b36351852d2faeca15230a9ac0325da95"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/zh-TW/thunderbird-91.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/zh-TW/thunderbird-91.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "2c3a20d639c793853ae57e850f15910ea3a9d35b1900ae8dc4d14689df080c42"; + sha256 = "2c9472a29dbd96fbbcbe7d9e23a112c9c894eee62dcb0ab08387d04e1f2741c4"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 1f94b3eb97..fe54bb1eca 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.0"; + version = "91.0.1"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "f3fcaff97b37ef41850895e44fbd2f42b0f1cb982542861bef89ef7ee606c6332296d61f666106be9455078933a2844c46bf243b71cc4364d9ff457d9c808a7a"; + sha512 = "54e1f3233c544cf28302496512aaf2a5fb5486aab070680e82cefbdd1d12a33867c638ced61e43958bae47e40ff551592a2cf4d537f98c22ed1df31c5d5bb09c"; }; patches = [ ./no-buildconfig-90.patch diff --git a/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix index d93fea1f70..c7500d9032 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix @@ -104,7 +104,7 @@ let server = source: generic { type = "murmur"; - postPatch = lib.optional iceSupport '' + postPatch = lib.optionalString iceSupport '' grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${zeroc-ice.dev}/share/ice/,g' ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix b/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix index 529b871d20..f80fb3a739 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix @@ -23,12 +23,12 @@ }: let - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "micahflee"; repo = "onionshare"; rev = "v${version}"; - sha256 = "sha256-mzLDvvpO82iGDnzY42wx1KCNmAxUgVhpaDVprtb+YOI="; + sha256 = "sha256-wU2020RNXlwJ2y9uzcLxIX4EECev1Z9YvNyiBalLj/Y="; }; meta = with lib; { description = "Securely and anonymously send and receive files"; @@ -94,6 +94,11 @@ in rec { # Tests use the home directory export HOME="$(mktemp -d)" ''; + + disabledTests = [ + "test_firefox_like_behavior" + "test_if_unmodified_since" + ]; }; onionshare-gui = buildPythonApplication { diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/1.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/1.nix deleted file mode 100644 index 4171efb7ce..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/1.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, intltool, libtorrent-rasterbar, pythonPackages }: - -pythonPackages.buildPythonPackage rec { - pname = "deluge"; - version = "1.3.15"; - - src = fetchurl { - url = "http://download.deluge-torrent.org/source/${pname}-${version}.tar.bz2"; - sha256 = "1467b9hmgw59gf398mhbf40ggaka948yz3afh6022v753c9j7y6w"; - }; - - patches = [ - # Fix preferences when built against libtorrent >=0.16 - (fetchpatch { - url = "https://git.deluge-torrent.org/deluge/patch/?id=38d7b7cdfde3c50d6263602ffb03af92fcbfa52e"; - sha256 = "0la3i0lkj6yv4725h4kbd07mhfwcb34w7prjl9gxg12q7px6c31d"; - }) - ]; - - propagatedBuildInputs = with pythonPackages; [ - pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity - libtorrent-rasterbar.dev libtorrent-rasterbar.python setuptools - ]; - - nativeBuildInputs = [ intltool ]; - - postInstall = '' - mkdir -p $out/share/applications - cp -R deluge/data/pixmaps $out/share/ - cp -R deluge/data/icons $out/share/ - cp deluge/data/share/applications/deluge.desktop $out/share/applications - ''; - - meta = with lib; { - homepage = "https://deluge-torrent.org"; - description = "Torrent client"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ domenkozar ebzzry ]; - broken = stdenv.isDarwin; - platforms = platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix index b7a17896ec..ac6e3bc3a0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sngrep"; - version = "1.4.8"; + version = "1.4.9"; src = fetchFromGitHub { owner = "irontec"; repo = pname; rev = "v${version}"; - sha256 = "0lnwsw9x4y4lr1yh749y24f71p5zsghwh5lp28zqfanw025mipf2"; + sha256 = "sha256-92wPRDFSoIOYFv3XKdsuYH8j3D8kXyg++q6VpIIMGDg="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix index 1c5327ebc6..abfd223fd0 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix @@ -63,8 +63,6 @@ in (mkDrv rec { "-fno-visibility-inlines-hidden" # https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10 ]; - patches = [ ./xdg-open-brief.patch ]; - tarballPath = "external/tarballs"; postUnpack = '' diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/override.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/override.nix index 0141b74c38..193b2cd763 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/override.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/override.nix @@ -7,4 +7,5 @@ attrs: configureFlags = attrs.configureFlags ++ [ (lib.enableFeature kdeIntegration "kf5") ]; + patches = [ ../xdg-open-brief.patch ]; # drop this when switching fresh to 7.2.0 } diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix index 0141b74c38..110a52ed9f 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix @@ -7,4 +7,5 @@ attrs: configureFlags = attrs.configureFlags ++ [ (lib.enableFeature kdeIntegration "kf5") ]; + patches = [ ../xdg-open-brief.patch ]; } diff --git a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix index db3c15454b..8533df4671 100644 --- a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.54.1"; + version = "0.54.2"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "16sv938sdbs01byqwngrfqmzb81zfhvk72ar53l68cg8qjvzs5ml"; + sha256 = "sha256-fKUKVeR0q8oylpwF4d3jnkON4vbQ80Fc9WYWStb67ek="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/neuron/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/neuron/default.nix index 7bfef3a82f..804407968e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/neuron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/neuron/default.nix @@ -60,13 +60,13 @@ stdenv.mkDerivation rec { else ["--without-mpi"]); - postInstall = lib.optionals (python != null) [ '' + postInstall = lib.optionalString (python != null) '' ## standardise python neuron install dir if any if [[ -d $out/lib/python ]]; then mkdir -p ''${out}/${python.sitePackages} mv ''${out}/lib/python/* ''${out}/${python.sitePackages}/ fi - '']; + ''; propagatedBuildInputs = [ readline ncurses which libtool ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/pymol/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/pymol/default.nix index 2df8b0e6d4..39bbae77a6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/pymol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/pymol/default.nix @@ -1,8 +1,18 @@ -{ lib, fetchurl, fetchFromGitHub, makeDesktopItem -, python3, python3Packages -, glew, glm, freeglut, libpng, libxml2, tk, freetype, msgpack }: - - +{ lib +, fetchFromGitHub +, makeDesktopItem +, python3 +, python3Packages +, netcdf +, glew +, glm +, freeglut +, libpng +, libxml2 +, tk +, freetype +, msgpack +}: let pname = "pymol"; description = "A Python-enhanced molecular graphics tool"; @@ -20,15 +30,15 @@ let in python3Packages.buildPythonApplication rec { inherit pname; - version = "2.3.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "schrodinger"; repo = "pymol-open-source"; rev = "v${version}"; - sha256 = "175cqi6gfmvv49i3ws19254m7ljs53fy6y82fm1ywshq2h2c93jh"; + sha256 = "sha256-JdsgcVF1w1xFPZxVcyS+GcWg4a1Bd4SvxFOuSdlz9SM="; }; - buildInputs = [ python3Packages.numpy glew glm freeglut libpng libxml2 tk freetype msgpack ]; + buildInputs = [ python3Packages.numpy glew glm freeglut libpng libxml2 tk freetype msgpack netcdf ]; NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2"; hardeningDisable = [ "format" ]; @@ -49,7 +59,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - description = description; + inherit description; homepage = "https://www.pymol.org/"; license = licenses.mit; maintainers = with maintainers; [ samlich ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix index 596083c270..d7398f39ec 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix @@ -64,7 +64,7 @@ assert lib.assertMsg (!(sanitizeAddress && sanitizeThreads)) "'sanitizeAddress' and 'sanitizeThreads' are mutually exclusive, use one."; let - inherit (lib) optional optionals; + inherit (lib) optional optionals optionalString; in stdenv.mkDerivation rec { pname = "kicad-base"; @@ -172,7 +172,7 @@ stdenv.mkDerivation rec { dontStrip = debug; - postInstall = optional (withI18n) '' + postInstall = optionalString (withI18n) '' mkdir -p $out/share lndir ${i18n}/share $out/share ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/openroad/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/openroad/default.nix new file mode 100644 index 0000000000..1b1eb39cff --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/openroad/default.nix @@ -0,0 +1,94 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, bison +, cmake +, doxygen +, flex +, git +, python3 +, swig4 +, boost172 +, cimg +, eigen +, lcov +, lemon-graph +, libjpeg +, pcre +, qtbase +, readline +, spdlog +, tcl +, tcllib +, xorg +, yosys +, zlib +}: + +mkDerivation rec { + pname = "openroad"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "The-OpenROAD-Project"; + repo = "OpenROAD"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "1p677xh16wskfj06jnplhpc3glibhdaqxmk0j09832chqlryzwyx"; + }; + + nativeBuildInputs = [ + bison + cmake + doxygen + flex + git + swig4 + ]; + + buildInputs = [ + boost172 + cimg + eigen + lcov + lemon-graph + libjpeg + pcre + python3 + qtbase + readline + spdlog + tcl + tcllib + yosys + xorg.libX11 + zlib + ]; + + postPatch = '' + patchShebangs --build etc/find_messages.py + ''; + + # Enable output images from the placer. + cmakeFlags = [ "-DUSE_CIMG_LIB=ON" ]; + + # Resynthesis needs access to the Yosys binaries. + qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ yosys ]}" ]; + + # Upstream uses vendored package versions for some dependencies, so regression testing is prudent + # to see if there are any breaking changes in unstable that should be vendored as well. + doCheck = false; # Disabled pending upstream release with fix for rcx log file creation. + checkPhase = '' + # Regression tests must be run from the project root not from within the CMake build directory. + cd .. + test/regression + ''; + + meta = with lib; { + description = "OpenROAD's unified application implementing an RTL-to-GDS flow"; + homepage = "https://theopenroadproject.org"; + license = licenses.bsd3; + maintainers = with maintainers; [ trepetti ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/why3/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/why3/default.nix index 924ff3fd9f..b9f14332f9 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/why3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/why3/default.nix @@ -1,12 +1,12 @@ { callPackage, fetchurl, fetchpatch, lib, stdenv , ocamlPackages, coqPackages, rubber, hevea, emacs }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "why3"; version = "1.4.0"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38425/why3-1.4.0.tar.gz"; + url = "https://gforge.inria.fr/frs/download.php/file/38425/why3-${version}.tar.gz"; sha256 = "0lw0cpx347zz9vvwqibmbxgs80fsd16scgk3isscvwxnajpc3rv8"; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/why3/with-provers.nix b/third_party/nixpkgs/pkgs/applications/science/logic/why3/with-provers.nix index d4fdbfd693..fc08f5d7c8 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/why3/with-provers.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/why3/with-provers.nix @@ -1,31 +1,30 @@ { stdenv, makeWrapper, runCommand, symlinkJoin, why3 }: provers: let configAwkScript = runCommand "why3-conf.awk" { inherit provers; } - '' - for p in $provers; do - for b in $p/bin/*; do - BASENAME=$(basename $b) - echo "/^command =/{ gsub(\"$BASENAME\", \"$b\") }" >> $out - done + '' + for p in $provers; do + for b in $p/bin/*; do + BASENAME=$(basename $b) + echo "/^command =/{ gsub(\"$BASENAME\", \"$b\") }" >> $out done - echo '{ print }' >> $out - ''; -in stdenv.mkDerivation { + done + echo '{ print }' >> $out + ''; +in +stdenv.mkDerivation { name = "${why3.name}-with-provers"; - phases = [ "buildPhase" "installPhase" ]; - nativeBuildInputs = [ makeWrapper ]; buildInputs = [ why3 ] ++ provers; buildPhase = '' - mkdir -p $out/share/why3/ - why3 config --detect-provers -C $out/share/why3/why3.conf - awk -i inplace -f ${configAwkScript} $out/share/why3/why3.conf + mkdir -p $out/share/why3/ + why3 config --detect-provers -C $out/share/why3/why3.conf + awk -i inplace -f ${configAwkScript} $out/share/why3/why3.conf ''; installPhase = '' - mkdir -p $out/bin - makeWrapper ${why3}/bin/why3 $out/bin/why3 --add-flags "--extra-config $out/share/why3/why3.conf" + mkdir -p $out/bin + makeWrapper ${why3}/bin/why3 $out/bin/why3 --add-flags "--extra-config $out/share/why3/why3.conf" ''; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/colpack/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/colpack/default.nix index f203852c96..3cc9290a76 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/colpack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/colpack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { @@ -12,20 +12,32 @@ stdenv.mkDerivation rec { sha256 = "1p05vry940mrjp6236c0z83yizmw9pk6ly2lb7d8rpb7j9h03glr"; }; - buildInputs = [ autoconf automake gettext libtool ]; + nativeBuildInputs = [ autoreconfHook ]; - configurePhase = '' - autoreconf -vif - ./configure --prefix=$out --enable-openmp + configureFlags = [ + "--enable-openmp=${if stdenv.isLinux then "yes" else "no"}" + "--enable-examples=no" + ]; + + postInstall = '' + # Remove libtool archive + rm $out/lib/*.la + + # Remove compiled examples (Basic examples get compiled anyway) + rm -r $out/examples + + # Copy the example sources (Basic tree contains scripts and object files) + mkdir -p $out/share/ColPack/examples/Basic + cp SampleDrivers/Basic/*.cpp $out/share/ColPack/examples/Basic + cp -r SampleDrivers/Matrix* $out/share/ColPack/examples ''; meta = with lib; { description = "A package comprising of implementations of algorithms for vertex coloring and derivative computation"; homepage = "http://cscapes.cs.purdue.edu/coloringpage/software.htm#functionalities"; - license = licenses.lgpl3; - platforms = platforms.linux; + license = licenses.lgpl3Plus; + platforms = platforms.unix; maintainers = with maintainers; [ edwtjo ]; }; - } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix index 0a6f1569cd..78b64d7f58 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix @@ -1,30 +1,34 @@ { lib, stdenv, fetchurl, cln, pkg-config, readline, gmp, python3 }: stdenv.mkDerivation rec { - name = "ginac-1.8.1"; + pname = "ginac"; + version = "1.8.1"; src = fetchurl { - url = "${meta.homepage}/${name}.tar.bz2"; + url = "https://www.ginac.de/ginac-${version}.tar.bz2"; sha256 = "sha256-8WldvWsYcGHvP7pQdkjJ1tukOPczsFjBb5J4y9z14as="; }; propagatedBuildInputs = [ cln ]; - buildInputs = [ readline ] ++ lib.optional stdenv.isDarwin gmp; + buildInputs = [ readline ] + ++ lib.optional stdenv.isDarwin gmp; nativeBuildInputs = [ pkg-config python3 ]; strictDeps = true; - preConfigure = "patchShebangs ginsh"; + preConfigure = '' + patchShebangs ginsh + ''; configureFlags = [ "--disable-rpath" ]; meta = with lib; { description = "GiNaC is Not a CAS"; - homepage = "https://www.ginac.de/"; + homepage = "https://www.ginac.de/"; maintainers = with maintainers; [ lovek323 ]; license = licenses.gpl2; - platforms = platforms.all; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix index f944499af4..876222772e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix @@ -1,40 +1,45 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, cctools, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "lp_solve"; - version = "5.5.2.5"; + version = "5.5.2.11"; src = fetchurl { url = "mirror://sourceforge/project/lpsolve/lpsolve/${version}/lp_solve_${version}_source.tar.gz"; - sha256 = "12pj1idjz31r7c2mb5w03vy1cmvycvbkx9z29s40qdmkp1i7q6i0"; + sha256 = "sha256-bUq/9cxqqpM66ObBeiJt8PwLZxxDj2lxXUHQn+gfkC8="; }; - patches = [ ./isnan.patch ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ + cctools + fixDarwinDylibNames + ]; - buildCommand = '' - . $stdenv/setup - tar xvfz $src - ( - cd lp_solve* - eval patchPhase - ) - ( - cd lp_solve*/lpsolve55 - bash ccc - mkdir -pv $out/lib - find bin -type f -exec cp -v "{}" $out/lib \; - ) - ( - cd lp_solve*/lp_solve - bash ccc - mkdir -pv $out/bin - find bin -type f -exec cp -v "{}" $out/bin \; - ) - ( - mkdir -pv $out/include - cp -v lp_solve*/*.h $out/include - ) + dontConfigure = true; + + buildPhase = let + ccc = if stdenv.isDarwin then "ccc.osx" else "ccc"; + in '' + runHook preBuild + + (cd lpsolve55 && bash -x -e ${ccc}) + (cd lp_solve && bash -x -e ${ccc}) + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -d -m755 $out/bin $out/lib $out/include/lpsolve + install -m755 lp_solve/bin/*/lp_solve -t $out/bin + install -m644 lpsolve55/bin/*/liblpsolve* -t $out/lib + install -m644 lp_*.h -t $out/include/lpsolve + + rm $out/lib/liblpsolve*.a + rm $out/include/lpsolve/lp_solveDLL.h # A Windows header + + runHook postInstall ''; meta = with lib; { @@ -44,6 +49,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ smironov ]; platforms = platforms.unix; }; - } - diff --git a/third_party/nixpkgs/pkgs/applications/science/math/lp_solve/isnan.patch b/third_party/nixpkgs/pkgs/applications/science/math/lp_solve/isnan.patch deleted file mode 100644 index bc1983d442..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/lp_solve/isnan.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -u a/lp_lib.h b/lp_lib.h ---- a/lp_lib.h 2016-05-04 19:45:15.753143720 +0900 -+++ b/lp_lib.h 2016-05-04 19:53:59.536920722 +0900 -@@ -59,9 +59,6 @@ - # if defined _WIN32 && !defined __GNUC__ - # define isnan _isnan - # endif --#if defined NOISNAN --# define isnan(x) FALSE --#endif - - #define SETMASK(variable, mask) variable |= mask - #define CLEARMASK(variable, mask) variable &= ~(mask) diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/default.nix index e39db4b1ac..b7821db1f9 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/default.nix @@ -38,8 +38,8 @@ let ]; language = "sagemath"; # just one 16x16 logo is available - logo32 = "${sage-src}/doc/common/themes/sage/static/sageicon.png"; - logo64 = "${sage-src}/doc/common/themes/sage/static/sageicon.png"; + logo32 = "${sage-src}/src/doc/common/themes/sage/static/sageicon.png"; + logo64 = "${sage-src}/src/doc/common/themes/sage/static/sageicon.png"; }; three = callPackage ./threejs-sage.nix { }; diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix index ba519cc2d0..eb718be12e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1iwa17s8ipj6a2b8zss5csb1k5y9s5js38syvq932rxcinbyjsl4"; }; - postPatch = lib.optional (stdenv.hostPlatform.libc == "glibc") '' + postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' sed -ie '/sys\/sysctl.h/d' ATOOLS/Org/Run_Parameter.C ''; diff --git a/third_party/nixpkgs/pkgs/applications/system/glances/default.nix b/third_party/nixpkgs/pkgs/applications/system/glances/default.nix index 8ddee9c0b4..7c3120f570 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.3"; + version = "3.2.3.1"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "1nc8bdzzrzaircq3myd32w6arpy2prn739886cq2h47cpinxmvpr"; + sha256 = "0h7y36z4rizl1lyxacq32vpmvbwn9w2nrvrxn791060cksfw4xwd"; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): @@ -31,7 +31,7 @@ buildPythonApplication rec { ]; doCheck = true; - preCheck = lib.optional stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.isDarwin '' export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks ''; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/aminal/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/aminal/default.nix index 7f04a93d6a..70d0d083dc 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/aminal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/aminal/default.nix @@ -33,9 +33,9 @@ buildGoPackage rec { sha256 = "0syv9md7blnl6i19zf8s1xjx5vfz6s755fxyg2ply0qc1pwhsj8n"; }; - preBuild = '' - buildFlagsArray=("-ldflags=-X ${goPackagePath}/version.Version=${version}") - ''; + ldflags = [ + "-X ${goPackagePath}/version.Version=${version}" + ]; meta = with lib; { description = "Golang terminal emulator from scratch"; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix index f698df598c..5aa14a0426 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk3, cairo +{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gtk3, cairo , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver, libxcb, nss, nspr , alsa-lib, cups, expat, udev, libpulseaudio, at-spi2-atk, at-spi2-core, libxshmfence @@ -6,7 +6,7 @@ let libPath = lib.makeLibraryPath [ - stdenv.cc.cc gtk3 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus + stdenv.cc.cc gtk3 atk glib pango gdk-pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb libXrender libX11 libXtst libXScrnSaver nss nspr alsa-lib cups expat udev libpulseaudio at-spi2-atk at-spi2-core libxshmfence libdrm libxkbcommon mesa diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix index 441c9904c0..cfd46a613f 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.21.2"; + version = "0.23.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "0y0mg8rr18mn0wzym7v48x6kl0ixd5q387kr5jhbdln55ph2jk9d"; + sha256 = "sha256-2RwDU6EOJWF0u2ikJFg9U2yqSXergDkJH3h2i+QJ7G4="; }; buildInputs = [ @@ -52,8 +52,14 @@ buildPythonApplication rec { ]; nativeBuildInputs = [ - pkg-config sphinx ncurses installShellFiles + ncurses + pkg-config + sphinx + furo + sphinx-copybutton + sphinxext-opengraph + sphinx-inline-tabs ] ++ lib.optionals stdenv.isDarwin [ imagemagick libicns # For the png2icns tool. @@ -111,12 +117,12 @@ buildPythonApplication rec { cp -r linux-package/{bin,share,lib} $out ''} wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick xsel ncurses.dev ]}" - runHook postInstall installShellCompletion --cmd kitty \ --bash <("$out/bin/kitty" + complete setup bash) \ --fish <("$out/bin/kitty" + complete setup fish) \ --zsh <("$out/bin/kitty" + complete setup zsh) + runHook postInstall ''; postInstall = '' @@ -136,7 +142,7 @@ buildPythonApplication rec { homepage = "https://github.com/kovidgoyal/kitty"; description = "A modern, hackable, featureful, OpenGL based terminal emulator"; license = licenses.gpl3Only; - changelog = "https://sw.kovidgoyal.net/kitty/changelog.html"; + changelog = "https://sw.kovidgoyal.net/kitty/changelog/"; platforms = platforms.darwin ++ platforms.linux; maintainers = with maintainers; [ tex rvolosatovs Luflosi ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix index 8ec57f2e69..19de4b28bf 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "git-chglog"; - version = "0.14.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = "git-chglog"; repo = "git-chglog"; rev = "v${version}"; - sha256 = "124bqywkj37gv61fswgrg528bf3rjqms1664x22lkn0sqh22zyv1"; + sha256 = "sha256-BiTnPCgymfpPxuy0i8u7JbpbEBeaSIJaikjwsPSA3qc="; }; - vendorSha256 = "09zjypmcc3ra7sw81q1pbbrlpxxp4k00p1cfkrrih8wvb25z89h5"; + vendorSha256 = "sha256-jIq+oacyT71m78iMZwWOBsBVAY/WxgyH9zRr8GiMGTU="; buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix index c67fb1532a..f5e964d3ca 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "git-filter-repo"; - version = "2.32.0"; + version = "2.33.0"; src = fetchurl { url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-CztFSyeKM9Bmcf0eSrLHH3vHGepd8WXPvcAACT+vFps="; + sha256 = "sha256-e88R2hNLvYKkFx9/soo6t7xNR4/o7Do9lYDku9wy5uk="; }; buildInputs = [ pythonPackages.python ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab-triage/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/gitlab-triage/Gemfile.lock index adec5b524f..e5df89d660 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab-triage/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab-triage/Gemfile.lock @@ -1,27 +1,35 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.4.4) + activesupport (5.2.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - concurrent-ruby (1.1.7) - gitlab-triage (1.13.0) + concurrent-ruby (1.1.9) + gitlab-triage (1.20.0) activesupport (~> 5.1) + globalid (~> 0.4) + graphql-client (~> 0.16) httparty (~> 0.17) + globalid (0.5.2) + activesupport (>= 5.0) + graphql (1.12.14) + graphql-client (0.16.0) + activesupport (>= 3.0) + graphql (~> 1.8) httparty (0.18.1) mime-types (~> 3.0) multi_xml (>= 0.5.2) - i18n (1.8.5) + i18n (1.8.10) concurrent-ruby (~> 1.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) - minitest (5.14.2) + mime-types-data (3.2021.0704) + minitest (5.14.4) multi_xml (0.6.0) thread_safe (0.3.6) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) PLATFORMS diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab-triage/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab-triage/gemset.nix index 5274877066..519ddc8bec 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab-triage/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab-triage/gemset.nix @@ -5,31 +5,63 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd"; + sha256 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj"; type = "gem"; }; - version = "5.2.4.4"; + version = "5.2.6"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; type = "gem"; }; - version = "1.1.7"; + version = "1.1.9"; }; gitlab-triage = { - dependencies = ["activesupport" "httparty"]; + dependencies = ["activesupport" "globalid" "graphql-client" "httparty"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11sas3h3n638gni1mysck1ahyakqnl8gg6g21pc3krs6jrg9qxj9"; + sha256 = "sha256-sg/YgRnp1+EcTcBqsm8vZrV0YuHTSJEFk/whhW8An6g="; type = "gem"; }; - version = "1.13.0"; + version = "1.20.0"; + }; + globalid = { + dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k6ww3shk3mv119xvr9m99l6ql0czq91xhd66hm8hqssb18r2lvm"; + type = "gem"; + }; + version = "0.5.2"; + }; + graphql = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "sha256-iweRDvp7EWY02B52iwbebEpiwL7Mj9E9RyeHYMuqc/o="; + type = "gem"; + }; + version = "1.12.14"; + }; + graphql-client = { + dependencies = ["activesupport" "graphql"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g971rccyrs3rk8812r6az54p28g66m4ngdcbszg31mvddjaqkr4"; + type = "gem"; + }; + version = "0.16.0"; }; httparty = { dependencies = ["mime-types" "multi_xml"]; @@ -48,10 +80,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; type = "gem"; }; - version = "1.8.5"; + version = "1.8.10"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -69,20 +101,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; + sha256 = "0dlxwc75iy0dj23x824cxpvpa7c8aqcpskksrmb32j6m66h5mkcy"; type = "gem"; }; - version = "3.2020.0512"; + version = "3.2021.0704"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; type = "gem"; }; - version = "5.14.2"; + version = "5.14.4"; }; multi_xml = { groups = ["default"]; @@ -110,9 +142,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.9"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index b7e95324f5..0b750332ea 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "mpv-playlistmanager"; - version = "unstable-2021-03-09"; + version = "unstable-2021-08-17"; src = fetchFromGitHub { owner = "jonniek"; repo = "mpv-playlistmanager"; - rev = "c15a0334cf6d4581882fa31ddb1e6e7f2d937a3e"; - sha256 = "uxcvgcSGS61UU8MmuD6qMRqpIa53iasH/vkg1xY7MVc="; + rev = "44d6911856a39e9a4057d19b70f21a9bc18bd6a9"; + sha256 = "IwH6XngfrZlKGDab/ut43hzHeino8DmWzWRX8Av21Sk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 32a35eca92..53e87fbb2b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -28,6 +28,7 @@ let basename = "streamlink-twitch-gui"; runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; + runtimeBins = lib.makeBinPath [ streamlink ]; arch = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -90,16 +91,23 @@ stdenv.mkDerivation rec { dontConfigure = true; installPhase = '' + runHook preInstall mkdir -p $out/{bin,opt/${basename},share} # Install all files, remove unnecessary ones cp -a . $out/opt/${basename}/ rm -r $out/opt/${basename}/{{add,remove}-menuitem.sh,credits.html,icons/} - - wrapProgram $out/opt/${basename}/${basename} --add-flags "--no-version-check" --prefix LD_LIBRARY_PATH : ${runtimeLibs} - ln -s "$out/opt/${basename}/${basename}" $out/bin/ - ln -s "${desktopItem}/share/applications" $out/share/ + cp -r "${desktopItem}/share/applications" $out/share/ + runHook postInstall + ''; + + preFixup = '' + gappsWrapperArgs+=( + --add-flags "--no-version-check" \ + --prefix LD_LIBRARY_PATH : ${runtimeLibs} \ + --prefix PATH : ${runtimeBins} + ) ''; desktopItem = makeDesktopItem { @@ -115,7 +123,7 @@ stdenv.mkDerivation rec { description = "Twitch.tv browser for Streamlink"; longDescription = "Browse Twitch.tv and watch streams in your videoplayer of choice"; homepage = "https://streamlink.github.io/streamlink-twitch-gui/"; - downloadPage = https://github.com/streamlink/streamlink-twitch-gui/releases; + downloadPage = "https://github.com/streamlink/streamlink-twitch-gui/releases"; license = licenses.mit; maintainers = with maintainers; [ rileyinman ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch b/third_party/nixpkgs/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch deleted file mode 100644 index ed22ed99b0..0000000000 --- a/third_party/nixpkgs/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/libqtile/backend/x11/xcursors.py b/libqtile/backend/x11/xcursors.py -index 24454b83..ef37875c 100644 ---- a/libqtile/backend/x11/xcursors.py -+++ b/libqtile/backend/x11/xcursors.py -@@ -107,7 +107,7 @@ class Cursors(dict): - - def _setup_xcursor_binding(self): - try: -- xcursor = ffi.dlopen('libxcb-cursor.so.0') -+ xcursor = ffi.dlopen('@xcb-cursor@/lib/libxcb-cursor.so.0') - except OSError: - logger.warning("xcb-cursor not found, fallback to font pointer") - return False -diff --git a/libqtile/pangocffi.py b/libqtile/pangocffi.py -index dbae27ed..54c2c35f 100644 ---- a/libqtile/pangocffi.py -+++ b/libqtile/pangocffi.py -@@ -52,10 +52,9 @@ try: - except ImportError: - raise ImportError("No module named libqtile._ffi_pango, be sure to run `./scripts/ffibuild`") - --gobject = ffi.dlopen('libgobject-2.0.so.0') --pango = ffi.dlopen('libpango-1.0.so.0') --pangocairo = ffi.dlopen('libpangocairo-1.0.so.0') -- -+gobject = ffi.dlopen('@glib@/lib/libgobject-2.0.so.0') -+pango = ffi.dlopen('@pango@/lib/libpango-1.0.so.0') -+pangocairo = ffi.dlopen('@pango@/lib/libpangocairo-1.0.so.0') - - def patch_cairo_context(cairo_t): - def create_layout(): diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch b/third_party/nixpkgs/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch deleted file mode 100644 index 1eaa5b8417..0000000000 --- a/third_party/nixpkgs/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/bin/qshell b/bin/qshell -index 5c652b7a..2d169eb2 100755 ---- a/bin/qshell -+++ b/bin/qshell -@@ -28,5 +28,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, "..")) - sys.path.insert(0, base_dir) - - if __name__ == '__main__': -+ __import__("importlib").import_module("libqtile.utils").restore_os_environment() - from libqtile.scripts import qshell - qshell.main() -diff --git a/bin/qtile b/bin/qtile -index ebc8fab5..08a965ef 100755 ---- a/bin/qtile -+++ b/bin/qtile -@@ -29,5 +29,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, "..")) - sys.path.insert(0, base_dir) - - if __name__ == '__main__': -+ __import__("importlib").import_module("libqtile.utils").restore_os_environment() - from libqtile.scripts import qtile - qtile.main() -diff --git a/bin/qtile-cmd b/bin/qtile-cmd -index a2136ee6..3d37a6d9 100755 ---- a/bin/qtile-cmd -+++ b/bin/qtile-cmd -@@ -8,5 +8,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, "..")) - sys.path.insert(0, base_dir) - - if __name__ == '__main__': -+ __import__("importlib").import_module("libqtile.utils").restore_os_environment() - from libqtile.scripts import qtile_cmd - qtile_cmd.main() -diff --git a/bin/qtile-run b/bin/qtile-run -index ac4cb1fd..74c589cb 100755 ---- a/bin/qtile-run -+++ b/bin/qtile-run -@@ -8,5 +8,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, "..")) - sys.path.insert(0, base_dir) - - if __name__ == '__main__': -+ __import__("importlib").import_module("libqtile.utils").restore_os_environment() - from libqtile.scripts import qtile_run - qtile_run.main() -diff --git a/bin/qtile-top b/bin/qtile-top -index a6251f27..0d524b1d 100755 ---- a/bin/qtile-top -+++ b/bin/qtile-top -@@ -8,5 +8,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, "..")) - sys.path.insert(0, base_dir) - - if __name__ == '__main__': -+ __import__("importlib").import_module("libqtile.utils").restore_os_environment() - from libqtile.scripts import qtile_top - qtile_top.main() -diff --git a/libqtile/utils.py b/libqtile/utils.py -index 2628c898..05117be7 100644 ---- a/libqtile/utils.py -+++ b/libqtile/utils.py -@@ -270,3 +270,10 @@ def guess_terminal(): - return terminal - - logger.error('Default terminal has not been found.') -+ -+def restore_os_environment(): -+ pythonpath = os.environ.pop("QTILE_SAVED_PYTHONPATH", "") -+ os.environ["PYTHONPATH"] = pythonpath -+ path = os.environ.pop("QTILE_SAVED_PATH", None) -+ if path: -+ os.environ["PATH"] = path - diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch b/third_party/nixpkgs/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch deleted file mode 100644 index c04d8a83c1..0000000000 --- a/third_party/nixpkgs/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libqtile/core/manager.py b/libqtile/core/manager.py -index c22eeb6a..2ffe4eab 100644 ---- a/libqtile/core/manager.py -+++ b/libqtile/core/manager.py -@@ -278,7 +278,7 @@ class Qtile(CommandObject): - logger.error("Unable to pickle qtile state") - argv = [s for s in argv if not s.startswith('--with-state')] - argv.append('--with-state=' + buf.getvalue().decode()) -- self._restart = (sys.executable, argv) -+ self._restart = (os.environ.get("QTILE_WRAPPER", "@out@/bin/qtile"), argv[1:]) - self.stop() - - async def finalize(self): diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/qtile/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/qtile/default.nix index 08b3a9834b..cd7b5a159e 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/qtile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/qtile/default.nix @@ -1,66 +1,66 @@ -{ lib, fetchFromGitHub, python37Packages, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }: +{ lib, fetchFromGitHub, python3, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }: -let cairocffi-xcffib = python37Packages.cairocffi.override { +let + enabled-xcffib = cairocffi-xcffib: cairocffi-xcffib.override { withXcffib = true; }; + + # make it easier to reference python + python = python3; + pythonPackages = python.pkgs; + + unwrapped = pythonPackages.buildPythonPackage rec { + name = "qtile-${version}"; + version = "0.18.0"; + + src = fetchFromGitHub { + owner = "qtile"; + repo = "qtile"; + rev = "v${version}"; + sha256 = "sha256-S9G/EI18p9EAyWgI1ajDrLimeE+ETBC9feUDb/QthqI="; + }; + + postPatch = '' + substituteInPlace libqtile/pangocffi.py \ + --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \ + --replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \ + --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 + substituteInPlace libqtile/backend/x11/xcursors.py \ + --replace libxcb-cursor.so.0 ${xcbutilcursor.out}/lib/libxcb-cursor.so.0 + ''; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + pkg-config + ] ++ (with pythonPackages; [ + setuptools-scm + ]); + + propagatedBuildInputs = with pythonPackages; [ + xcffib + (enabled-xcffib cairocffi) + setuptools + python-dateutil + dbus-python + mpd2 + psutil + pyxdg + pygobject3 + ]; + + doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure. + + meta = with lib; { + homepage = "http://www.qtile.org/"; + license = licenses.mit; + description = "A small, flexible, scriptable tiling window manager written in Python"; + platforms = platforms.linux; + maintainers = with maintainers; [ kamilchm ]; + }; + }; in - -python37Packages.buildPythonApplication rec { - name = "qtile-${version}"; - version = "0.16.0"; - - src = fetchFromGitHub { - owner = "qtile"; - repo = "qtile"; - rev = "v${version}"; - sha256 = "1klv1k9847nyx71sfrhqyl1k51k2w8phqnp2bns4dvbqii7q125l"; - }; - - patches = [ - ./0001-Substitution-vars-for-absolute-paths.patch - ./0002-Restore-PATH-and-PYTHONPATH.patch - ./0003-Restart-executable.patch - ]; - - postPatch = '' - substituteInPlace libqtile/core/manager.py --subst-var-by out $out - substituteInPlace libqtile/pangocffi.py --subst-var-by glib ${glib.out} - substituteInPlace libqtile/pangocffi.py --subst-var-by pango ${pango.out} - substituteInPlace libqtile/backend/x11/xcursors.py --subst-var-by xcb-cursor ${xcbutilcursor.out} - ''; - - SETUPTOOLS_SCM_PRETEND_VERSION = version; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib libxcb cairo pango python37Packages.xcffib ]; - - pythonPath = with python37Packages; [ - xcffib - cairocffi-xcffib - setuptools - setuptools-scm - python-dateutil - dbus-python - mpd2 - psutil - pyxdg - pygobject3 - ]; - - postInstall = '' - wrapProgram $out/bin/qtile \ - --run 'export QTILE_WRAPPER=$0' \ - --run 'export QTILE_SAVED_PYTHONPATH=$PYTHONPATH' \ - --run 'export QTILE_SAVED_PATH=$PATH' - ''; - - doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure. - - meta = with lib; { - homepage = "http://www.qtile.org/"; - license = licenses.mit; - description = "A small, flexible, scriptable tiling window manager written in Python"; - platforms = platforms.linux; - maintainers = with maintainers; [ kamilchm ]; - }; -} + (python.withPackages (ps: [ unwrapped ])).overrideAttrs (_: { + # export underlying qtile package + passthru = { inherit unwrapped; }; + }) diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/bg.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/bg.nix index 1d5dea76b3..6d91d8c8f4 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/bg.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/bg.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { sha256 = "17508q9wsw6c1lsxlcbxj74z2naqhwi5c7lkbq24m4lk8qmy0576"; }; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/idle.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/idle.nix index 8c1ae0b359..da23359b64 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/idle.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/idle.nix @@ -5,20 +5,15 @@ stdenv.mkDerivation rec { pname = "swayidle"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "swaywm"; repo = "swayidle"; rev = version; - sha256 = "1nd3v8r9549lykdwh4krldfl59lzaspmmai5k1icy7dvi6kkr18r"; + sha256 = "0ziya8d5pvvxg16jhy4i04pvq11bdvj68gz5q654ar4dldil17nn"; }; - postPatch = '' - substituteInPlace meson.build \ - --replace "version: '1.5'" "version: '${version}'" - ''; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols systemd ]; diff --git a/third_party/nixpkgs/pkgs/build-support/dhall-to-nix.nix b/third_party/nixpkgs/pkgs/build-support/dhall-to-nix.nix index 3805656dfa..96cc16e16f 100644 --- a/third_party/nixpkgs/pkgs/build-support/dhall-to-nix.nix +++ b/third_party/nixpkgs/pkgs/build-support/dhall-to-nix.nix @@ -15,12 +15,12 @@ Note that this uses "import from derivation", meaning that Nix will perform a build during the evaluation phase if you use this `dhallToNix` utility */ -{ stdenv, dhall-nix }: +{ stdenv, dhall-nix, writeText }: let dhallToNix = code : let - file = builtins.toFile "dhall-expression" code; + file = writeText "dhall-expression" code; drv = stdenv.mkDerivation { name = "dhall-compiled.nix"; diff --git a/third_party/nixpkgs/pkgs/build-support/docker/default.nix b/third_party/nixpkgs/pkgs/build-support/docker/default.nix index d76efac55b..832d2949a1 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/docker/default.nix @@ -750,6 +750,9 @@ rec { root:x:0: nobody:x:65534: '') + (writeTextDir "etc/nsswitch.conf" '' + hosts: files dns + '') (runCommand "var-empty" { } '' mkdir -p $out/var/empty '') diff --git a/third_party/nixpkgs/pkgs/build-support/fetchgx/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchgx/default.nix index 3ccf5d273f..93f60c0a9c 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchgx/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchgx/default.nix @@ -12,7 +12,9 @@ stdenvNoCC.mkDerivation { outputHashMode = "recursive"; outputHash = sha256; - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; + dontConfigure = true; + doCheck = false; + doInstallCheck = false; buildPhase = '' export GOPATH=$(pwd)/vendor diff --git a/third_party/nixpkgs/pkgs/build-support/replace-secret/replace-secret.nix b/third_party/nixpkgs/pkgs/build-support/replace-secret/replace-secret.nix index e04d1aed5f..4881ba25f5 100644 --- a/third_party/nixpkgs/pkgs/build-support/replace-secret/replace-secret.nix +++ b/third_party/nixpkgs/pkgs/build-support/replace-secret/replace-secret.nix @@ -3,13 +3,14 @@ stdenv.mkDerivation { name = "replace-secret"; buildInputs = [ python3 ]; - phases = [ "installPhase" "checkPhase" ]; + dontUnpack = true; installPhase = '' + runHook preInstall install -D ${./replace-secret.py} $out/bin/replace-secret patchShebangs $out + runHook postInstall ''; - doCheck = true; - checkPhase = '' + installCheckPhase = '' install -m 0600 ${./test/input_file} long_test $out/bin/replace-secret "replace this" ${./test/passwd} long_test $out/bin/replace-secret "and this" ${./test/rsa} long_test diff --git a/third_party/nixpkgs/pkgs/build-support/rust/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/default.nix index 58b91b88e8..2eb45bcafa 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/default.nix @@ -10,7 +10,6 @@ , importCargoLock , rustPlatform , callPackage -, remarshal , git , rust , rustc diff --git a/third_party/nixpkgs/pkgs/build-support/skaware/build-skaware-package.nix b/third_party/nixpkgs/pkgs/build-support/skaware/build-skaware-package.nix index b27b65f48a..d6f26fe908 100644 --- a/third_party/nixpkgs/pkgs/build-support/skaware/build-skaware-package.nix +++ b/third_party/nixpkgs/pkgs/build-support/skaware/build-skaware-package.nix @@ -15,6 +15,8 @@ # TODO(Profpatsch): automatically infer most of these # : list string , configureFlags + # : string +, postConfigure ? null # mostly for moving and deleting files from the build directory # : lines , postInstall @@ -79,6 +81,8 @@ in stdenv.mkDerivation { ++ (lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}"); + inherit postConfigure; + # TODO(Profpatsch): ensure that there is always a $doc output! postInstall = '' echo "Cleaning & moving common files" diff --git a/third_party/nixpkgs/pkgs/build-support/templaterpm/default.nix b/third_party/nixpkgs/pkgs/build-support/templaterpm/default.nix index efe70efe6c..c98716a3fe 100644 --- a/third_party/nixpkgs/pkgs/build-support/templaterpm/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/templaterpm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ python toposort rpm ]; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix index 014d6bd6f8..88f9683e34 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "0.040"; + version = "0.041"; in fetchzip { name = "JuliaMono-ttf-${version}"; url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz"; - sha256 = "sha256-Rrsvs682aWXZqydnOifXTJMa4uPl/aCGbVNRPGxkZng="; + sha256 = "sha256-OjguPR2MFjbY72/PF0R43/g6i95uAPVPbXk+HS0B360="; postFetch = '' mkdir -p $out/share/fonts/truetype diff --git a/third_party/nixpkgs/pkgs/data/fonts/libertinus/default.nix b/third_party/nixpkgs/pkgs/data/fonts/libertinus/default.nix index 7d95b6a26f..8f58cb92ba 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/libertinus/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/libertinus/default.nix @@ -1,29 +1,29 @@ -{ lib, fetchFromGitHub }: +{ lib, fetchurl }: let - version = "6.9"; -in fetchFromGitHub rec { + version = "7.040"; +in fetchurl rec { name = "libertinus-${version}"; + url = "https://github.com/alerque/libertinus/releases/download/v${version}/Libertinus-${version}.tar.xz"; + sha256 = "0z658r88p52dyrcslv0wlccw0sw7m5jz8nbqizv95nf7bfw96iyk"; - owner = "alif-type"; - repo = "libertinus"; - rev = "v${version}"; + downloadToTemp = true; + recursiveHash = true; postFetch = '' tar xf $downloadedFile --strip=1 - install -m444 -Dt $out/share/fonts/opentype *.otf - install -m444 -Dt $out/share/doc/${name} *.txt + install -m644 -Dt $out/share/fonts/opentype static/OTF/*.otf ''; - sha256 = "0765a7w0askkhrjmjk638gcm9h6fcm1jpaza8iw9afr3sz1s0xlq"; meta = with lib; { - description = "A fork of the Linux Libertine and Linux Biolinum fonts"; + description = "The Libertinus font family"; longDescription = '' - Libertinus fonts is a fork of the Linux Libertine and Linux Biolinum fonts - that started as an OpenType math companion of the Libertine font family, - but grown as a full fork to address some of the bugs in the fonts. + The Libertinus font project began as a fork of the Linux Libertine and + Linux Biolinum fonts. The original impetus was to add an OpenType math + companion to the Libertine font families. Over time it grew into to a + full-fledged fork addressing many of the bugs in the Libertine fonts. ''; - homepage = "https://github.com/alif-type/libertinus"; + homepage = "https://github.com/alerque/libertinus"; license = licenses.ofl; maintainers = with maintainers; [ siddharthist ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/data/themes/marwaita-pop_os/default.nix b/third_party/nixpkgs/pkgs/data/themes/marwaita-pop_os/default.nix index f719976746..ca35460eff 100644 --- a/third_party/nixpkgs/pkgs/data/themes/marwaita-pop_os/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/marwaita-pop_os/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-pop_os"; - version = "1.1"; + version = "10.3"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "1nwfyy3jnfsdlqgj7ig9gbawazdm76g02b0hrfsll17j5498d59y"; + sha256 = "1j6d91kx6iw8sy35rhhjvwb3qz60bvf7a7g7q2i0sznzdicrwsq6"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/vimix/default.nix b/third_party/nixpkgs/pkgs/data/themes/vimix/default.nix index 5f08f2c445..d92ff42f48 100644 --- a/third_party/nixpkgs/pkgs/data/themes/vimix/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/vimix/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "vimix-gtk-themes"; - version = "2021-08-09"; + version = "2021-08-17"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0j6sq7z4zqc9q4hqcq4y9vh4qpgl0v1i353l6rcd6bh1r594rwjm"; + sha256 = "1pn737w99j4ij8qkgw0rrzhbcqzni73z5wnkfqgqqbhj38rafbpv"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix index aa7efdf51c..6a7cb1742b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -66,13 +66,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "40.3"; + version = "40.4"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-erEMbulpmCjdch6/jOHeRk3KqpHUlYI79LhMiTmejCs="; + sha256 = "160z8bz2kqmrs6a4cs2gakv0rl9ba69p3ij2xjakqav50n9r3i9b"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/sushi/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/sushi/default.nix index c42b6964bf..cd93094120 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/sushi/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/sushi/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "sushi"; - version = "3.38.0"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/sushi/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0vlqqk916dymv4asbyvalp1m096a5hh99nx23i4xavzvgygh4h2h"; + sha256 = "8+bRDIFVKNA6Zl+v0VwHGeAXqBOXWzrzIHYZnjeIiOk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/atril/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/atril/default.nix index 7e8afde588..81c5bdcd78 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/atril/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/atril/default.nix @@ -24,11 +24,11 @@ with lib; stdenv.mkDerivation rec { pname = "atril"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06nyicj96dqcv035yqnzmm6pk3m35glxj0ny6lk1vwqkk2l750xl"; + sha256 = "0pz44k3axhjhhwfrfvnwvxak1dmjkwqs63rhrbcaagyymrp7cpki"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix index 3b96f67b12..27bf56cf51 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation rec { pname = "caja-dropbox"; - version = "1.24.0"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1rcn82q58mv9hn5xamvzay2pw1szfk6zns94362476fcp786lji2"; + sha256 = "16w4r0zjps12lmzwiwpb9qnmbvd0p391q97296sxa8k88b1x14wn"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix index 5c08074f04..0b21f2721d 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "caja-extensions"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13jkynanqj8snys0if8lv6yx1y0jrm778s2152n4x65hsghc6cw5"; + sha256 = "03zwv3yl5553cnp6jjn7vr4l28dcdhsap7qimlrbvy20119kj5gh"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/caja/caja-extension-dirs.patch b/third_party/nixpkgs/pkgs/desktops/mate/caja/caja-extension-dirs.patch deleted file mode 100644 index 0b1453bd46..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/mate/caja/caja-extension-dirs.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 35e9e6a6f3ba6cbe62a3957044eb67864f5d8e66 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= -Date: Tue, 11 Feb 2020 17:49:13 -0300 -Subject: [PATCH] Look for caja extentions at $CAJA_EXTENTSION_DIRS - -CAJA_EXTENSION_DIRS is a list of paths where caja extensions are -looked for. It is needed for distributions like NixOS that do not -install all extensions in the same directory. In NixOS each package is -installed in a self contained directory. ---- - libcaja-private/caja-module.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/libcaja-private/caja-module.c b/libcaja-private/caja-module.c -index d54d7cf..9794e56 100644 ---- a/libcaja-private/caja-module.c -+++ b/libcaja-private/caja-module.c -@@ -258,11 +258,25 @@ void - caja_module_setup (void) - { - static gboolean initialized = FALSE; -+ gchar *caja_extension_dirs; -+ gchar **dir_vector; - - if (!initialized) - { - initialized = TRUE; - -+ caja_extension_dirs = (gchar *) g_getenv ("CAJA_EXTENSION_DIRS"); -+ -+ if (caja_extension_dirs) -+ { -+ dir_vector = g_strsplit (caja_extension_dirs, G_SEARCHPATH_SEPARATOR_S, 0); -+ -+ for (gchar **dir = dir_vector; *dir != NULL; ++ dir) -+ load_module_dir (*dir); -+ -+ g_strfreev(dir_vector); -+ } -+ - load_module_dir (CAJA_EXTENSIONDIR); - - eel_debug_call_at_shutdown (free_module_objects); --- -2.25.0 - diff --git a/third_party/nixpkgs/pkgs/desktops/mate/caja/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/caja/default.nix index c533f78849..65d6e1a21e 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/caja/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/caja/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "caja"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ylgb4b31vwgqmmknrhm4m9gfa1rzb9azpdd9myi0hscrr3h22z5"; + sha256 = "1m0ai2r8b2mvlr8bqj9n6vg1pwzlwa46fqpq206wgyx5sgxac052"; }; nativeBuildInputs = [ @@ -25,10 +25,6 @@ stdenv.mkDerivation rec { hicolor-icon-theme ]; - patches = [ - ./caja-extension-dirs.patch - ]; - configureFlags = [ "--disable-update-mimedb" ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/default.nix index 291d26afcd..e9822f0242 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/default.nix @@ -52,7 +52,7 @@ let mate-user-share = callPackage ./mate-user-share { }; mate-utils = callPackage ./mate-utils { }; mozo = callPackage ./mozo { }; - pluma = callPackage ./pluma { }; + pluma = callPackage ./pluma { inherit (pkgs.gnome) adwaita-icon-theme; }; python-caja = callPackage ./python-caja { }; basePackages = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/engrampa/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/engrampa/default.nix index 81d34b8b12..b9627dae02 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/engrampa/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/engrampa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "engrampa"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0x26djz73g3fjwzcpr7k60xb6qx5izhw7lf2ggn34iwpihl0sa7f"; + sha256 = "1qsy0ynhj1v0kyn3g3yf62g31rwxmpglfh9xh0w5lc9j5k1b5kcp"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/eom/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/eom/default.nix index 27c1207965..7947247bf1 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/eom/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/eom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "eom"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08rjckr1hdw7c31f2hzz3vq0rn0c5z3hmvl409y6k6ns583k1bgf"; + sha256 = "1nv7q0yw11grgxr5lyvll0f7fl823kpjp05z81bwgnvd76m6kw97"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix index 8d0b567f16..967e223f2b 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmatekbd"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "17mcxfkvl14p04id3n5kbhpjwjq00c8wmbyciyy2hm7kwdln6zx8"; + sha256 = "1b8iv2hmy8z2zzdsx8j5g583ddxh178bq8dnlqng9ifbn35fh3i2"; }; nativeBuildInputs = [ pkg-config gettext ]; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix index 4fe73fadbc..2824c958de 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "libmatemixer"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1n6rq7k66zvfd6sb7h92xihh021w9hysfa4yd1mzjcbb7c62ybqx"; + sha256 = "1wcz4ppg696m31f5x7rkyvxxdriik2vprsr83b4wbs97bdhcr6ws"; }; nativeBuildInputs = [ pkg-config gettext ]; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix index b042df0fe1..b325de3b3c 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmateweather"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "02d7c59pami1fzxg73mp6risa9hvsdpgs68f62wkg09nrppzsk4v"; + sha256 = "05bvc220p135l6qnhh3qskljxffds0f7fjbjnrpq524w149rgzd7"; }; nativeBuildInputs = [ pkg-config gettext ]; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/marco/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/marco/default.nix index 8c6df49fd1..e7e6547284 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/marco/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/marco/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop -, libXdamage, libXpresent, libstartup_notification, gnome, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: +, libXdamage, libXpresent, libstartup_notification, gnome, glib, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "marco"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19s2y2s9immp86ni3395mgxl605m2wn10m8399y9qkgw2b5m10s9"; + sha256 = "01avxrg2fc6grfrp6hl8b0im4scy9xf6011swfrhli87ig6hhg7n"; }; nativeBuildInputs = [ @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { mate-settings-daemon ]; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + enableParallelBuilding = true; passthru.updateScript = mateUpdateScript { inherit pname version; }; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix index 3a34d7af71..f06db0adc1 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix @@ -1,37 +1,39 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome, glib, gtk3, gtksourceview3, libwnck -, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook -, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, dbus-glib, glib, gtk3, gtksourceview3 +, gucharmap, libmateweather, libnl, libwnck, libgtop, libxml2, libnotify, mate-panel, polkit +, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-applets"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0h70i4x3bk017pgv4zn280682wm58vwdjm7kni91ni8rmblnnvyp"; + sha256 = "0xy9dwiqvmimqshbfq80jxq65aznlgx491lqq8rl4x8c9sdl7q5p"; }; nativeBuildInputs = [ - pkg-config gettext itstool + pkg-config wrapGAppsHook ]; buildInputs = [ + dbus-glib gtk3 gtksourceview3 - gnome.gucharmap - libwnck + gucharmap + hicolor-icon-theme libgtop - libxml2 + libmateweather + libnl libnotify + libwnck + libxml2 + mate-panel polkit upower wirelesstools - mate.libmateweather - mate.mate-panel - hicolor-icon-theme ]; configureFlags = [ "--enable-suid=no" ]; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix index cfe1325b83..3fa6f37b2a 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-backgrounds"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ixb2vlm3dr52ibp4ggrbkf38m3q6i5lxjg4ix82gxbb6h6a3gp5"; + sha256 = "0379hngy3ap1r5kmqvmzs9r710k2c9nal2ps3hq765df4ir15j8d"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix index a3e8d3b595..4344e97075 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix @@ -1,24 +1,26 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libmpc, libxml2, mpfr, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-calc"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1yg8j0dqy37fljd20pwxdgna3f1v7k9wmdr9l4r1nqf4a7zwi96l"; + sha256 = "0mddfh9ixhh60nfgx5kcprcl9liavwqyina11q3pnpfs3n02df3y"; }; nativeBuildInputs = [ - pkg-config gettext itstool + pkg-config wrapGAppsHook ]; buildInputs = [ gtk3 + libmpc libxml2 + mpfr ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-common/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-common/default.nix index 58314df673..159fb75426 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-common/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-common/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-common"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0srb2ly5pjq1g0cs8m39nbfv33dvsc2j4g2gw081xis3awzh3lki"; + sha256 = "014wpfqpqmfkzv81paap4fz15mj1gsyvaxlrfqsp9a3yxw4f7jaf"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix index b94e7ecfd0..9c1186a692 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "mate-control-center"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18vsqkcl4n3k5aa05fqha61jc3133zw07gd604sm0krslwrwdn39"; + sha256 = "0jhkn0vaz8glji4j5ar6im8l2wf40kssl07gfkz40rcgfzm18rr8"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix index 62e0b5b319..19ad26656f 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-desktop"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1nd1dn8mm1z6x4r68a25q4vzys1a6fmbzc94ss1z1n1872pczs6i"; + sha256 = "18sj8smf0b998m5qvki37hxg0agcx7wmgz9z7cwv6v48i2dnnz2z"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix index cf18cf528f..0e4fc7f0c3 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-icon-theme"; - version = "1.24.0"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0a2lz61ivwwcdznmwlmgjr6ipr9sdl5g2czbagnpxkwz8f3m77na"; + sha256 = "0nha555fhhn0j5wmzmdc7bh93ckzwwdm8mwmzma5whkzslv09xa1"; }; nativeBuildInputs = [ pkg-config gettext iconnamingutils ]; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix index 804bf2352d..3cf2ac9b4c 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-indicator-applet"; - version = "1.24.0"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0m7pvbs5hhy5f400wqb8wp0dw3pyjpjnjax9qzc73j97l1k3zawf"; + sha256 = "144fh9f3lag2cqnmb6zxlh8k83ya8kha6rmd7r8gg3z5w3nzpyz4"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-media/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-media/default.nix index 6072e81fb3..c4e9a9d5b0 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-media/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-media/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-media"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "118i4w2i2g3hfgbfn3hjzjkfq8vjj6049r7my3vna9js23b7ab92"; + sha256 = "0fiwzsir8i1bqz7g7b20g5zs28qq63j41v9c5z69q8fq7wh1nwwb"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix index 5b11c20380..33f4374465 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-menus"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "17zc9fn14jykhn30z8iwlw0qwk32ivj6gxgww3xrqvqk0da5yaas"; + sha256 = "1r7zf64aclaplz77hkl9kq0xnz6jk1l49z64i8v56c41pm59c283"; }; nativeBuildInputs = [ pkg-config gettext gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix index de452f456a..f4908906ff 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-netbook"; - version = "1.24.0"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1bmk9gq5gcqkvfppa7i1hqfph8sajc3xs189s4ha97g0ifwd98a8"; + sha256 = "12gdy69nfysl8vmd8lv8b0lknkaagplrrz88nh6n0rmjkxnipgz3"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix index ac5e5376a8..8bc730032f 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3, - libnotify, libwnck, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }: + libnotify, libwnck, gtk3, libxml2, mate-desktop, mate-panel, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-notification-daemon"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "02mf9186cbziyvz7ycb0j9b7rn085a7f9hrm03n28q5kz0z1k92q"; + sha256 = "1fmr6hlcy2invp2yxqfqgpdx1dp4qa8xskjq2rm6v4gmz20nag5j"; }; nativeBuildInputs = [ @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { libnotify libwnck gtk3 + mate-desktop + mate-panel ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix index cd73408d4c..d0e54bab58 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-panel"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1sj851h71nq4ssrsd4k5b0vayxmspl5x3rhf488b2xpcj81vmi9h"; + sha256 = "0r7a8wy9p2x6r0c4qaa81qhhjc080rxnc6fznz7i6fkv2z91wbh9"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix index 174e2e4662..8ec813ce83 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-polkit"; - version = "1.24.0"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1450bqzlnvwy3xa98lj102j2cf7piqbxcd1cy2zp41rdl8ri3gvn"; + sha256 = "0kkjv025l1l8352m5ky1g7hmk7isgi3dnfnh7sqg9pyhml97i9dd"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix index fd7b19e1de..c7b6690d2e 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, libsecret, dbus-glib, upower, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-power-manager"; - version = "1.24.3"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1rmcrpii3hl35qjznk6h5cq72n60cs12n294hjyakxr9kvgns7l6"; + sha256 = "0ybvwv24g8awxjl2asgvx6l2ghn4limcm48ylha68dkpy3607di6"; }; nativeBuildInputs = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { libxml2 libcanberra-gtk3 gtk3 - gnome.libgnome-keyring + libsecret libnotify dbus-glib upower diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix index f132bbcd26..b87ec4b68d 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-screensaver"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18hxhglryfcbpbns9izigiws7lvdv5dnsaaz226ih3aar5db1ysy"; + sha256 = "0xmgzrb5nk7x6ganf7jd4gmdafanx7f0znga0lhsd8kd40r40la1"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix index 849f767c7c..7e77f89805 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mate-sensors-applet"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1nb4fy3mcymv7pmnc0czpxgp1sqvs533jwnqv1b5cqby415ljb16"; + sha256 = "0s19r30fsicqvvcnz57lv158pi35w9zn5i7h5hz59224y0zpqhsc"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix index f790b0f65d..152ecf572d 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mate-session-manager"; - version = "1.24.3"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18mhv8dq18hvx28gi88c9499s3s1nsq55m64sas8fqlvnp2sx84h"; + sha256 = "05hqi8wlwjr07mp5njhp7h06mgnv98zsxaxkmxc5w3iwb3va45ar"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix index 6c35a1d631..3ece77dc08 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mate-settings-daemon"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "051r7xrx1byllsszbwsk646sq4izyag9yxg8jw2rm6x6mgwb89cc"; + sha256 = "0hbdwqagxh1mdpxfdqr1ps3yqvk0v0c5zm0bwk56y6l1zwbs0ymp"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix index fed7dc1262..d94695ac80 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-system-monitor"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1mbny5hs5805398krvcsvi1jfhyq9a9dfciyrnis67n2yisr1hzp"; + sha256 = "13rkrk7c326ng8164aqfp6i7334n7zrmbg61ncpjprbrvlx2qiw3"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix index 2c4d4223ec..ed7ba49c18 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,31 +1,27 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, mate-desktop, dconf, vte, pcre2, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-terminal"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0qmyhxmarwkxad8k1m9q1iwx70zhfp6zc2mh74nv26nj4gr3h3am"; + sha256 = "08mgxbviik2dwwnbclp0518wlag2fhcr6c2yadgcbhwiq4aff9vp"; }; - buildInputs = [ - glib - itstool - libxml2 - - mate.mate-desktop - - vte - gtk3 - dconf - pcre2 + nativeBuildInputs = [ + gettext + itstool + pkg-config + wrapGAppsHook ]; - nativeBuildInputs = [ - pkg-config - gettext - wrapGAppsHook + buildInputs = [ + dconf + libxml2 + mate-desktop + pcre2 + vte ]; enableParallelBuilding = true; @@ -33,7 +29,7 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname version; }; meta = with lib; { - description = "The MATE Terminal Emulator"; + description = "MATE desktop terminal emulator"; homepage = "https://mate-desktop.org"; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix index d7c83cc982..8a5aadb936 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-user-guide"; - version = "1.24.0"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ddxya84iydvy85dbqls0wmz2rph87wri3rsdhv4rkbhh5g4sd7f"; + sha256 = "1h620ngryqc4m8ybvc92ba8404djnm0l65f34mlw38g9ad8d9085"; }; nativeBuildInputs = [ itstool gettext libxml2 ]; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix index 1126e58513..9907552f3c 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mate-user-share"; - version = "1.24.0"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1h4aabcby96nsg557brzzb0an1qvnawhim2rinzlzg4fhkvdfnr5"; + sha256 = "1wh0b4qw5wzpl7sg44lpwjb9r6xllch3xfz8c2cchl8rcgbh2kph"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix index 0b7b181bd5..6801368dc4 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mate-utils"; - version = "1.24.0"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1b16n1628gcsym5mph6lr9x5xm4rgkxsa8xwr2wlx8g2gw2775i1"; + sha256 = "0bkqj8qwwml9xyvb680yy06lv3dzwkv89yrzz5jamvz88ar6m9bw"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mozo/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mozo/default.nix index 4122e82316..037989083b 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mozo/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mozo/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mozo"; - version = "1.24.1"; + version = "1.26.0"; format = "other"; doCheck = false; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "14ps43gdh1sfvq49yhl58gxq3rc0d25i2d7r4ghlzf07ssxl53b0"; + sha256 = "1hnxqdk69g7j809k6picgq8y626hnyznlzxd0pi743gshpwwnhj6"; }; nativeBuildInputs = [ pkg-config gettext gobject-introspection wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/pluma/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/pluma/default.nix index 5e226f4d88..9eb0f9283b 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/pluma/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/pluma/default.nix @@ -1,32 +1,32 @@ { lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3 -, gnome, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }: +, adwaita-icon-theme, gtksourceview4, libpeas, mate-desktop, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "pluma"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "183frfhll3sb4r12p24160j1c1cfd102nlp5rrwvyv5qqm7i2fg4"; + sha256 = "0lway12q2xygiwjgrx7chgka838jbnmlzz98g7agag1rwzd481ii"; }; nativeBuildInputs = [ - pkg-config gettext - perl - itstool isocodes + itstool + perl + pkg-config wrapGAppsHook ]; buildInputs = [ + adwaita-icon-theme enchant - libxml2 - python3 - gtksourceview3 + gtksourceview4 libpeas - gnome.adwaita-icon-theme - mate.mate-desktop + libxml2 + mate-desktop + python3 ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/python-caja/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/python-caja/default.nix index 8104da3420..ccee7b0468 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/python-caja/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/python-caja/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "python-caja"; - version = "1.24.0"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1wp61q64cgzr3syd3niclj6rjk87wlib5m86i0myf5ph704r3qgg"; + sha256 = "181zcs1pi3762chm4xraqs8048jm7jzwnvgwla1v3z2nqzpp3xr1"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix b/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix index b5ac2e187d..eb8c898e09 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20200719"; + version = "20210808"; src = fetchurl { - url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "18095i98mk5kc1vpaf6gvmvhiyl2x4zrcwd7ix5l98jydldiz7wx"; + url = "https://repo1.maven.org/maven2/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar"; + sha256 = "1cvibvm8l4mp64ml6lpsh3w62bgbr42pi3i7ga8ss0prhr0dsk3y"; }; - sourceRoot = "."; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; installPhase = '' mkdir -p $out/share/java $out/bin - cp closure-compiler-v${version}.jar $out/share/java + cp ${src} $out/share/java/closure-compiler-v${version}.jar makeWrapper ${jre}/bin/java $out/bin/closure-compiler \ --add-flags "-jar $out/share/java/closure-compiler-v${version}.jar" ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/10/default.nix index 441ce6cdcd..edb9b1ba71 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/10/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/10/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , ncurses5 , python27 @@ -6,22 +7,21 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "10.2.1"; - release = "10-2020-q4-major"; - subdir = "10-2020q4"; + version = "10.3.1"; + release = "10.3-2021.07"; suffix = { aarch64-linux = "aarch64-linux"; - x86_64-darwin = "mac"; + x86_64-darwin = "mac-10.14.6"; x86_64-linux = "x86_64-linux"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${release}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { - aarch64-linux = "0spkbh7vnda1w0nvavk342nb24nqxn8kln3k9j85mzil560qqg9l"; - x86_64-darwin = "1h5xn0npwkilqxg7ifrymsl7kjpafr9r9gjqgcpb0kjxavijvldy"; - x86_64-linux = "066nvhg5zdf3jvy9w23y439ghf1hvbicdyrrw9957gwb8ym4q4r1"; + aarch64-linux = "0y4nyrff5bq90v44z2h90gqgl18bs861i9lygx4z89ym85jycx9s"; + x86_64-darwin = "1r3yidmgx1xq1f19y2c5njf2g95vs9cssmmsxsb68qm192r58i8a"; + x86_64-linux = "1skcalz1sr0hhpjcl8qjsqd16n2w0zrbnlrbr8sx0g728kiqsnwc"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index bab73948ac..a0d414d974 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , ncurses5 , python27 diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index ccd99e096f..4df2a90f52 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , ncurses5 , python27 diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index 363e87ecb6..152ecdb867 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , ncurses5 , python27 diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix index 6ff1567286..c625134508 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , ncurses5 , python27 diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix deleted file mode 100644 index 21080fd96c..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix +++ /dev/null @@ -1,284 +0,0 @@ -{ lib -, stdenv -, fetchurl -, tzdata -, iana-etc -, runCommand -, perl -, which -, pkg-config -, patch -, procps -, pcre -, cacert -, Security -, Foundation -, mailcap -, runtimeShell -, buildPackages -, pkgsBuildTarget -, fetchpatch -, callPackage -}: - -let - go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; - - goBootstrap = runCommand "go-bootstrap" { } '' - mkdir $out - cp -rf ${go_bootstrap}/* $out/ - chmod -R u+w $out - find $out -name "*.c" -delete - cp -rf $out/bin/* $out/share/go/bin/ - ''; - - goarch = platform: { - "i686" = "386"; - "x86_64" = "amd64"; - "aarch64" = "arm64"; - "arm" = "arm"; - "armv5tel" = "arm"; - "armv6l" = "arm"; - "armv7l" = "arm"; - "powerpc64le" = "ppc64le"; - "mips" = "mips"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system"); - - # We need a target compiler which is still runnable at build time, - # to handle the cross-building case where build != host == target - targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; -in - -stdenv.mkDerivation rec { - pname = "go"; - version = "1.14.15"; - - src = fetchurl { - url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0jci03f5z09xibbdqg4lnv2k3crhal1phzwr6lc4ajp514i3plby"; - }; - - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkg-config patch procps ]; - buildInputs = [ cacert pcre ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Security Foundation ]; - - hardeningDisable = [ "all" ]; - - prePatch = '' - patchShebangs ./ # replace /bin/bash - - # This source produces shell script at run time, - # and thus it is not corrected by patchShebangs. - substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${runtimeShell}' - - # Patch the mimetype database location which is missing on NixOS. - # but also allow static binaries built with NixOS to run outside nix - sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{listen,parse}_test.go - rm src/syscall/exec_linux_test.go - - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go - # Remove the api check as it never worked - sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go - # Remove the coverage test as we have removed this utility - sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go - # Remove the timezone naming test - sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go - # Remove disable setgid test - sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go - # Remove cert tests that conflict with NixOS's cert resolution - sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go - # TestWritevError hangs sometimes - sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go - # TestVariousDeadlines fails sometimes - sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go - - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go - - # Disable cgo lookup tests not works, they depend on resolver - rm src/net/cgo_unix_test.go - - '' + lib.optionalString stdenv.isLinux '' - # prepend the nix path to the zoneinfo files but also leave the original value for static binaries - # that run outside a nix server - sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go - - '' + lib.optionalString stdenv.isAarch32 '' - echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace src/race.bash --replace \ - "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true - sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - - sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go - sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go - sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go - sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go - - sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - - # TestCurrent fails because Current is not implemented on Darwin - sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go - sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - ''; - - patches = [ - ./remove-tools-1.11.patch - ./ssl-cert-file-1.13.patch - ./remove-test-pie-1.14.patch - ./creds-test.patch - ./go-1.9-skip-flaky-19608.patch - ./go-1.9-skip-flaky-20072.patch - ./skip-external-network-tests.patch - ./skip-nohup-tests.patch - ./go_no_vendor_checks-1_14.patch - - # support TZ environment variable starting with colon - (fetchpatch { - name = "tz-support-colon.patch"; - url = "https://github.com/golang/go/commit/58fe2cd4022c77946ce4b598cf3e30ccc8367143.patch"; - sha256 = "0vphwiqrm0qykfj3rfayr65qzk22fksg7qkamvaz0lmf6fqvbd2f"; - }) - - # fix rare TestDontCacheBrokenHTTP2Conn failure - (fetchpatch { - url = "https://github.com/golang/go/commit/ea1437a8cdf6bb3c2d2447833a5d06dbd75f7ae4.patch"; - sha256 = "1lyzy4nf8c34a966vw45j3j7hzpvncq2gqspfxffzkyh17xd8sgy"; - }) - ] ++ [ - # breaks under load: https://github.com/golang/go/issues/25628 - (if stdenv.isAarch32 - then ./skip-test-extra-files-on-aarch32-1.14.patch - else ./skip-test-extra-files-on-386-1.14.patch) - ]; - - postPatch = '' - find . -name '*.orig' -exec rm {} ';' - ''; - - GOOS = stdenv.targetPlatform.parsed.kernel.name; - GOARCH = goarch stdenv.targetPlatform; - # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. - # Go will nevertheless build a for host system that we will copy over in - # the install phase. - GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; - GOHOSTARCH = goarch stdenv.buildPlatform; - - # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those - # to be different from CC/CXX - CC_FOR_TARGET = - if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${targetCC}/bin/${targetCC.targetPrefix}cc" - else - null; - CXX_FOR_TARGET = - if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${targetCC}/bin/${targetCC.targetPrefix}c++" - else - null; - - GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - # Hopefully avoids test timeouts on Hydra - GO_TEST_TIMEOUT_SCALE = 3; - - # Indicate that we are running on build infrastructure - # Some tests assume things like home directories and users exists - GO_BUILDER_NAME = "nix"; - - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; - - postConfigure = '' - export GOCACHE=$TMPDIR/go-cache - # this is compiled into the binary - export GOROOT_FINAL=$out/share/go - - export PATH=$(pwd)/bin:$PATH - - ${lib.optionalString (stdenv.buildPlatform != stdenv.targetPlatform) '' - # Independent from host/target, CC should produce code for the building system. - # We only set it when cross-compiling. - export CC=${buildPackages.stdenv.cc}/bin/cc - ''} - ulimit -a - ''; - - postBuild = '' - (cd src && ./make.bash) - ''; - - doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; - - checkPhase = '' - runHook preCheck - (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) - runHook postCheck - ''; - - preInstall = '' - rm -r pkg/obj - # Contains the wrong perl shebang when cross compiling, - # since it is not used for anything we can deleted as well. - rm src/regexp/syntax/make_perl_groups.pl - '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' - mv bin/*_*/* bin - rmdir bin/*_* - ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} - ''} - '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' - rm -rf bin/*_* - ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} - ''} - '' else ""); - - installPhase = '' - runHook preInstall - mkdir -p $GOROOT_FINAL - cp -a bin pkg src lib misc api doc $GOROOT_FINAL - ln -s $GOROOT_FINAL/bin $out/bin - runHook postInstall - ''; - - disallowedReferences = [ goBootstrap ]; - - meta = with lib; { - homepage = "http://golang.org/"; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = teams.golang.members; - platforms = platforms.linux ++ platforms.darwin; - knownVulnerabilities = [ - "Support for Go 1.14 ended with the release of Go 1.16: https://golang.org/doc/devel/release.html#policy" - ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks-1_14.patch b/third_party/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks-1_14.patch deleted file mode 100644 index 53e4ba78ff..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks-1_14.patch +++ /dev/null @@ -1,23 +0,0 @@ -Starting from go1.14, go verifes that vendor/modules.txt matches the requirements -and replacements listed in the main module go.mod file, and it is a hard failure if -vendor/modules.txt is missing. - -Relax module consistency checks and switch back to pre go1.14 behaviour if -vendor/modules.txt is missing regardless of go version requirement in go.mod. - -This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 -See https://github.com/golang/go/issues/37948 for discussion. - -diff --git a/src/cmd/go/internal/modload/init.go b/src/cmd/go/internal/modload/init.go -index 71f68efbcc..3c566d04dd 100644 ---- a/src/cmd/go/internal/modload/init.go -+++ b/src/cmd/go/internal/modload/init.go -@@ -133,7 +133,7 @@ func checkVendorConsistency() { - readVendorList() - - pre114 := false -- if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 { -+ if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { - // Go versions before 1.14 did not include enough information in - // vendor/modules.txt to check for consistency. - // If we know that we're on an earlier version, relax the consistency check. diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/remove-test-pie-1.14.patch b/third_party/nixpkgs/pkgs/development/compilers/go/remove-test-pie-1.14.patch deleted file mode 100644 index 218fcd46d8..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/go/remove-test-pie-1.14.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go -index 56bdfcac19..d7d67ab94d 100644 ---- a/src/cmd/dist/test.go -+++ b/src/cmd/dist/test.go -@@ -580,29 +580,6 @@ func (t *tester) registerTests() { - }) - } - -- // Test internal linking of PIE binaries where it is supported. -- if goos == "linux" && (goarch == "amd64" || goarch == "arm64") { -- t.tests = append(t.tests, distTest{ -- name: "pie_internal", -- heading: "internal linking of -buildmode=pie", -- fn: func(dt *distTest) error { -- t.addCmd(dt, "src", t.goTest(), "reflect", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) -- return nil -- }, -- }) -- // Also test a cgo package. -- if t.cgoEnabled && t.internalLink() { -- t.tests = append(t.tests, distTest{ -- name: "pie_internal_cgo", -- heading: "internal linking of -buildmode=pie", -- fn: func(dt *distTest) error { -- t.addCmd(dt, "src", t.goTest(), "os/user", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) -- return nil -- }, -- }) -- } -- } -- - // sync tests - if goos != "js" { // js doesn't support -cpu=10 - t.tests = append(t.tests, distTest{ diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/skip-external-network-tests.patch b/third_party/nixpkgs/pkgs/development/compilers/go/skip-external-network-tests.patch deleted file mode 100644 index 5791b213cb..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/go/skip-external-network-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go -index 85cae90..94b4edd 100644 ---- a/src/cmd/go/go_test.go -+++ b/src/cmd/go/go_test.go -@@ -4946,6 +4946,8 @@ func TestBuildmodePIE(t *testing.T) { - } - - func TestExecBuildX(t *testing.T) { -+ t.Skipf("skipping, test requires networking") -+ - tooSlow(t) - if !canCgo { - t.Skip("skipping because cgo not enabled") -diff --git a/src/net/dial_test.go b/src/net/dial_test.go -index 00a84d1..27f9ec9 100644 ---- a/src/net/dial_test.go -+++ b/src/net/dial_test.go -@@ -968,6 +968,8 @@ func TestDialerControl(t *testing.T) { - // mustHaveExternalNetwork is like testenv.MustHaveExternalNetwork - // except that it won't skip testing on non-iOS builders. - func mustHaveExternalNetwork(t *testing.T) { -+ t.Skipf("Nix sandbox does not have networking") -+ - t.Helper() - ios := runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") - if testenv.Builder() == "" || ios { diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.13.patch b/third_party/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.13.patch deleted file mode 100644 index 02a50d9c72..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.13.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go -index 255a8d3525..a467255a54 100644 ---- a/src/crypto/x509/root_cgo_darwin.go -+++ b/src/crypto/x509/root_cgo_darwin.go -@@ -280,6 +280,8 @@ int CopyPEMRoots(CFDataRef *pemRoots, CFDataRef *untrustedPemRoots, bool debugDa - import "C" - import ( - "errors" -+ "io/ioutil" -+ "os" - "unsafe" - ) - -@@ -295,6 +297,13 @@ func loadSystemRoots() (*CertPool, error) { - buf := C.GoBytes(unsafe.Pointer(C.CFDataGetBytePtr(data)), C.int(C.CFDataGetLength(data))) - roots := NewCertPool() - roots.AppendCertsFromPEM(buf) -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - - if C.CFDataGetLength(untrustedData) == 0 { - return roots, nil -diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go -index 2f6a8b8d60..b81889fe69 100644 ---- a/src/crypto/x509/root_darwin.go -+++ b/src/crypto/x509/root_darwin.go -@@ -92,6 +92,14 @@ func execSecurityRoots() (*CertPool, error) { - verifyCh = make(chan rootCandidate) - ) - -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } -+ - // Using 4 goroutines to pipe into verify-cert seems to be - // about the best we can do. The verify-cert binary seems to - // just RPC to another server with coarse locking anyway, so -diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go -index 48de50b4ea..750e12c6b4 100644 ---- a/src/crypto/x509/root_unix.go -+++ b/src/crypto/x509/root_unix.go -@@ -38,6 +38,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - - files := certFiles - if f := os.Getenv(certFileEnv); f != "" { diff --git a/third_party/nixpkgs/pkgs/development/compilers/mono/6.nix b/third_party/nixpkgs/pkgs/development/compilers/mono/6.nix index 04028648a2..1a7297af91 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mono/6.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mono/6.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix ({ inherit Foundation libobjc; - version = "6.12.0.90"; + version = "6.12.0.122"; srcArchiveSuffix = "tar.xz"; - sha256 = "1b6d0926rd0nkmsppwjgmwsxx1479jjvr1gm7zwk64siml15rpji"; + sha256 = "sha256-KcJ3Zg/F51ExB67hy/jFBXyTcKTN/tovx4G+aYbYnSM="; enableParallelBuilding = true; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix b/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix index 2516d9c810..949c70318a 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.08.06"; + version = "2021.08.16"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "dd6376433154e008045695f5420469670b0c3a88"; - sha256 = "197k0a3cjnwinr4nnx7gqvpfi0wdhnmsmvcx12166jg7m1va5kw7"; + rev = "b37d133c43c45862bd5c550b5d7fffaa8c49b968"; + sha256 = "0qc9d8cay2j5ggn0mgjq484vv7a14na16s9dmp7bqz7r9cn4b98n"; name = "nextpnr"; }) (fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix index 9478f83477..1d6776303b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.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-${lib.versions.major version}.jdk/Contents/Home/man $out/share/man + ''; + passthru = { home = jdk; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix index fee21023c4..3e6f3a044f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix @@ -38,8 +38,11 @@ "armv5tel" = "armv5te"; "riscv64" = "riscv64gc"; }.${cpu.name} or cpu.name; + vendor_ = platform.rustc.platform.vendor or { + "w64" = "pc"; + }.${vendor.name} or vendor.name; in platform.rustc.config - or "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; + or "${cpu_}-${vendor_}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; # Returns the name of the rust target if it is standard, or the json file # containing the custom target spec. diff --git a/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix b/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix index fe821f18c1..1ffdc5ec02 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, makeWrapper, jre, gnugrep, coreutils -, writeScript, common-updater-scripts, git, gnused, nix, nixfmt, majorVersion }: +{ stdenv, lib, fetchurl, makeWrapper, jre, gnugrep, coreutils, writeScript +, common-updater-scripts, git, gnused, nix, nixfmt, majorVersion }: with lib; @@ -20,8 +20,8 @@ let }; "2.12" = { - version = "2.12.13"; - sha256 = "17548sx7liskkadqiqaajmwp2w7bh9m2d8hp2mwyg8yslmjx4pcc"; + version = "2.12.14"; + sha256 = "/X4+QDIogBOinAoUR8WX+vew5Jl2LA2YHbIQmel4BCY="; pname = "scala_2_12"; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix index 5301156026..7fc2485da0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix @@ -12,12 +12,13 @@ , swig , bash , libxml2 -, clang -, python +, clang_10 +, python3 , ncurses , libuuid , libbsd , icu +, libgcc , autoconf , libtool , automake @@ -35,9 +36,14 @@ }: let - version = "5.1.1"; + version = "5.4.2"; - fetch = { repo, sha256, fetchSubmodules ? false }: + # These dependency versions can be found in utils/update_checkout/update-checkout-config.json. + swiftArgumentParserVersion = "0.3.0"; + yamsVersion = "3.0.1"; + swiftFormatVersion = "0.50400.0"; + + fetchSwiftRelease = { repo, sha256, fetchSubmodules ? false }: fetchFromGitHub { owner = "apple"; inherit repo sha256 fetchSubmodules; @@ -45,63 +51,87 @@ let name = "${repo}-${version}-src"; }; + # Sources based on utils/update_checkout/update_checkout-config.json. sources = { - llvm = fetch { - repo = "swift-llvm"; - sha256 = "00ldd9dby6fl6nk3z17148fvb7g9x4jkn1afx26y51v8rwgm1i7f"; + swift = fetchSwiftRelease { + repo = "swift"; + sha256 = "0qrkqkwpmk312fi12kwwyihin01qb7sphhdz5c6an8j1rjfd9wbv"; }; - compilerrt = fetch { - repo = "swift-compiler-rt"; - sha256 = "1431f74l0n2dxn728qp65nc6hivx88fax1wzfrnrv19y77br05wj"; - }; - clang = fetch { - repo = "swift-clang"; - sha256 = "0n7k6nvzgqp6h6bfqcmna484w90db3zv4sh5rdh89wxyhdz6rk4v"; - }; - clangtools = fetch { - repo = "swift-clang-tools-extra"; - sha256 = "0snp2rpd60z239pr7fxpkj332rkdjhg63adqvqdkjsbrxcqqcgqa"; - }; - indexstore = fetch { - repo = "indexstore-db"; - sha256 = "1gwkqkdmpd5hn7555dpdkys0z50yh00hjry2886h6rx7avh5p05n"; - }; - sourcekit = fetch { - repo = "sourcekit-lsp"; - sha256 = "0k84ssr1k7grbvpk81rr21ii8csnixn9dp0cga98h6i1gshn8ml4"; - }; - cmark = fetch { + cmark = fetchSwiftRelease { repo = "swift-cmark"; - sha256 = "079smm79hbwr06bvghd2sb86b8gpkprnzlyj9kh95jy38xhlhdnj"; + sha256 = "0340j9x2n40yx61ma2pgqfbn3a9ijrh20iwzd1zxqq87rr76hh3z"; }; - lldb = fetch { - repo = "swift-lldb"; - sha256 = "0j787475f0nlmvxqblkhn3yrvn9qhcb2jcijwijxwq95ar2jdygs"; - }; - llbuild = fetch { + llbuild = fetchSwiftRelease { repo = "swift-llbuild"; - sha256 = "1n2s5isxyl6b6ya617gdzjbw68shbvd52vsfqc1256rk4g448v8b"; + sha256 = "0d7sj5a9b5c1ry2209cpccic5radf9s48sp1lahqzmd1pdx3n7pi"; }; - pm = fetch { + argumentParser = fetchFromGitHub { + owner = "apple"; + repo = "swift-argument-parser"; + rev = swiftArgumentParserVersion; + sha256 = "15vv7hnffa84142q97dwjcn196p2bg8nfh89d6nnix0i681n1qfd"; + name = "swift-argument-parser-${swiftArgumentParserVersion}"; + }; + driver = fetchSwiftRelease { + repo = "swift-driver"; + sha256 = "1j08273haqv7786rkwsmw7g103glfwy1d2807490id9lagq3r66z"; + }; + toolsSupportCore = fetchSwiftRelease { + repo = "swift-tools-support-core"; + sha256 = "07gm28ki4px7xzrplvk9nd1pp5r9nyi87l21i0rcbb3r6wrikxb4"; + }; + swiftpm = fetchSwiftRelease { repo = "swift-package-manager"; - sha256 = "1a49jmag5mpld9zr96g8a773334mrz1c4nyw38gf4p6sckf4jp29"; + sha256 = "05linnzlidxamzl3723zhyrfm24pk2cf1x66a3nk0cxgnajw0vzx"; }; - xctest = fetch { + syntax = fetchSwiftRelease { + repo = "swift-syntax"; + sha256 = "1y9agx9bg037xjhkwc28xm28kjyqydgv21s4ijgy5l51yg1g0daj"; + }; + # TODO: possibly re-add stress-tester. + corelibsXctest = fetchSwiftRelease { repo = "swift-corelibs-xctest"; - sha256 = "0rxy9sq7i0s0kxfkz0hvdp8zyb40h31f7g4m0kry36qk82gzzh89"; + sha256 = "00c68580yr12yxshl0hxyhp8psm15fls3c7iqp52hignyl4v745r"; }; - foundation = fetch { + corelibsFoundation = fetchSwiftRelease { repo = "swift-corelibs-foundation"; - sha256 = "1iiiijsnys0r3hjcj1jlkn3yszzi7hwb2041cnm5z306nl9sybzp"; + sha256 = "1jyadm2lm7hhik8n8wacfiffpdwqsgnilwmcw22qris5s2drj499"; }; - libdispatch = fetch { + corelibsLibdispatch = fetchSwiftRelease { repo = "swift-corelibs-libdispatch"; - sha256 = "0laqsizsikyjhrzn0rghvxd8afg4yav7cbghvnf7ywk9wc6kpkmn"; + sha256 = "1s46c0hrxi42r43ff5f1pq2imb3hs05adfpwfxkilgqyb5svafsp"; fetchSubmodules = true; }; - swift = fetch { - repo = "swift"; - sha256 = "0m4r1gzrnn0s1c7haqq9dlmvpqxbgbkbdfmq6qaph869wcmvdkvy"; + # TODO: possibly re-add integration-tests. + # Linux does not support Xcode playgrounds. + # We provide our own ninja. + # We provider our own icu. + yams = fetchFromGitHub { + owner = "jpsim"; + repo = "Yams"; + rev = yamsVersion; + sha256 = "13md54y7lalrpynrw1s0w5yw6rrjpw46fml9dsk2m3ph1bnlrqrq"; + name = "Yams-${yamsVersion}"; + }; + # We provide our own CMake. + indexstoreDb = fetchSwiftRelease { + repo = "indexstore-db"; + sha256 = "1ap3hiq2jd3cn10d8d674xysq27by878mvq087a80681r8cdivn3"; + }; + sourcekitLsp = fetchSwiftRelease { + repo = "sourcekit-lsp"; + sha256 = "02m9va0lsn2hnwkmgrbgj452sbyaswwmq14lqvxgnb7gssajv4gc"; + }; + format = fetchFromGitHub { + owner = "apple"; + repo = "swift-format"; + rev = swiftFormatVersion; + sha256 = "0skmmggsh31f3rnqcrx43178bc7scrjihibnwn68axagasgbqn4k"; + name = "swift-format-${swiftFormatVersion}-src"; + }; + llvmProject = fetchSwiftRelease { + repo = "llvm-project"; + sha256 = "166hd9d2i55zj70xjb1qmbblbfyk8hdb2qv974i07j6cvynn30lm"; }; }; @@ -112,6 +142,7 @@ let libblocksruntime libbsd libedit + libgcc libuuid libxml2 ncurses @@ -119,6 +150,8 @@ let swig ]; + python = (python3.withPackages (ps: [ps.six])); + cmakeFlags = [ "-DGLIBC_INCLUDE_PATH=${stdenv.cc.libc.dev}/include" "-DC_INCLUDE_DIRS=${lib.makeSearchPathOutput "dev" "include" devInputs}:${libxml2.dev}/include/libxml2" @@ -136,6 +169,7 @@ stdenv.mkDerivation { cmake coreutils findutils + git gnumake libtool makeWrapper @@ -147,11 +181,12 @@ stdenv.mkDerivation { which ]; buildInputs = devInputs ++ [ - clang + clang_10 ]; - # TODO: Revisit what's propagated and how + # TODO: Revisit what needs to be propagated and how. propagatedBuildInputs = [ + libgcc libgit2 python ]; @@ -164,32 +199,33 @@ stdenv.mkDerivation { cd src export SWIFT_SOURCE_ROOT=$PWD - cp -r ${sources.llvm} llvm - cp -r ${sources.compilerrt} compiler-rt - cp -r ${sources.clang} clang - cp -r ${sources.clangtools} clang-tools-extra - cp -r ${sources.indexstore} indexstore-db - cp -r ${sources.sourcekit} sourcekit-lsp - cp -r ${sources.cmark} cmark - cp -r ${sources.lldb} lldb - cp -r ${sources.llbuild} llbuild - cp -r ${sources.pm} swiftpm - cp -r ${sources.xctest} swift-corelibs-xctest - cp -r ${sources.foundation} swift-corelibs-foundation - cp -r ${sources.libdispatch} swift-corelibs-libdispatch cp -r ${sources.swift} swift + cp -r ${sources.cmark} cmark + cp -r ${sources.llbuild} llbuild + cp -r ${sources.argumentParser} swift-argument-parser + cp -r ${sources.driver} swift-driver + cp -r ${sources.toolsSupportCore} swift-tools-support-core + cp -r ${sources.swiftpm} swiftpm + cp -r ${sources.syntax} swift-syntax + # TODO: possibly re-add stress-tester. + cp -r ${sources.corelibsXctest} swift-corelibs-xctest + cp -r ${sources.corelibsFoundation} swift-corelibs-foundation + cp -r ${sources.corelibsLibdispatch} swift-corelibs-libdispatch + # TODO: possibly re-add integration-tests. + cp -r ${sources.yams} yams + cp -r ${sources.indexstoreDb} indexstore-db + cp -r ${sources.sourcekitLsp} sourcekit-lsp + cp -r ${sources.format} swift-format + cp -r ${sources.llvmProject} llvm-project chmod -R u+w . ''; patchPhase = '' - # Glibc 2.31 fix - patch -p1 -i ${./patches/swift-llvm.patch} - - # Just patch all the things for now, we can focus this later + # Just patch all the things for now, we can focus this later. patchShebangs $SWIFT_SOURCE_ROOT - # TODO eliminate use of env. + # TODO: eliminate use of env. find -type f -print0 | xargs -0 sed -i \ -e 's|/usr/bin/env|${coreutils}/bin/env|g' \ -e 's|/usr/bin/make|${gnumake}/bin/make|g' \ @@ -197,16 +233,13 @@ stdenv.mkDerivation { -e 's|/bin/cp|${coreutils}/bin/cp|g' \ -e 's|/usr/bin/file|${file}/bin/file|g' - substituteInPlace swift/stdlib/public/Platform/CMakeLists.txt \ - --replace '/usr/include' "${stdenv.cc.libc.dev}/include" - substituteInPlace swift/utils/build-script-impl \ - --replace '/usr/include/c++' "${gccForLibs}/include/c++" - patch -p1 -d swift -i ${./patches/glibc-arch-headers.patch} + # Build configuration patches. patch -p1 -d swift -i ${./patches/0001-build-presets-linux-don-t-require-using-Ninja.patch} patch -p1 -d swift -i ${./patches/0002-build-presets-linux-allow-custom-install-prefix.patch} patch -p1 -d swift -i ${./patches/0003-build-presets-linux-don-t-build-extra-libs.patch} patch -p1 -d swift -i ${./patches/0004-build-presets-linux-plumb-extra-cmake-options.patch} - + substituteInPlace swift/cmake/modules/SwiftConfigureSDK.cmake \ + --replace '/usr/include' "${stdenv.cc.libc.dev}/include" sed -i swift/utils/build-presets.ini \ -e 's/^test-installable-package$/# \0/' \ -e 's/^test$/# \0/' \ @@ -214,41 +247,37 @@ stdenv.mkDerivation { -e 's/^long-test$/# \0/' \ -e 's/^stress-test$/# \0/' \ -e 's/^test-optimized$/# \0/' \ - \ -e 's/^swift-install-components=autolink.*$/\0;editor-integration/' - substituteInPlace clang/lib/Driver/ToolChains/Linux.cpp \ - --replace 'SysRoot + "/lib' '"${glibc}/lib" "' - substituteInPlace clang/lib/Driver/ToolChains/Linux.cpp \ - --replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "' - patch -p1 -d clang -i ${./patches/llvm-toolchain-dir.patch} - patch -p1 -d clang -i ${./purity.patch} + # LLVM toolchain patches. + patch -p1 -d llvm-project/clang -i ${./patches/0005-clang-toolchain-dir.patch} + patch -p1 -d llvm-project/clang -i ${./patches/0006-clang-purity.patch} + substituteInPlace llvm-project/clang/lib/Driver/ToolChains/Linux.cpp \ + --replace 'SysRoot + "/lib' '"${glibc}/lib" "' \ + --replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "' \ + --replace 'LibDir = "lib";' 'LibDir = "${glibc}/lib";' \ + --replace 'LibDir = "lib64";' 'LibDir = "${glibc}/lib";' \ + --replace 'LibDir = X32 ? "libx32" : "lib64";' 'LibDir = "${glibc}/lib";' - # Workaround hardcoded dep on "libcurses" (vs "libncurses"): + # Substitute ncurses for curses in llbuild. sed -i 's/curses/ncurses/' llbuild/*/*/CMakeLists.txt - # uuid.h is not part of glibc, but of libuuid + sed -i 's/curses/ncurses/' llbuild/*/*/*/CMakeLists.txt + + # uuid.h is not part of glibc, but of libuuid. sed -i 's|''${GLIBC_INCLUDE_PATH}/uuid/uuid.h|${libuuid.dev}/include/uuid/uuid.h|' swift/stdlib/public/Platform/glibc.modulemap.gyb - # Compatibility with glibc 2.30 - # Adapted from https://github.com/apple/swift-package-manager/pull/2408 - patch -p1 -d swiftpm -i ${./patches/swift-package-manager-glibc-2.30.patch} - # https://github.com/apple/swift/pull/27288 - patch -p1 -d swift -i ${fetchpatch { - url = "https://github.com/apple/swift/commit/f968f4282d53f487b29cf456415df46f9adf8748.patch"; - sha256 = "1aa7l66wlgip63i4r0zvi9072392bnj03s4cn12p706hbpq0k37c"; - }} - + # Support library build script patches. PREFIX=''${out/#\/} - substituteInPlace indexstore-db/Utilities/build-script-helper.py \ - --replace usr "$PREFIX" - substituteInPlace sourcekit-lsp/Utilities/build-script-helper.py \ - --replace usr "$PREFIX" + substituteInPlace swift/utils/swift_build_support/swift_build_support/products/benchmarks.py \ + --replace \ + "'--toolchain', toolchain_path," \ + "'--toolchain', '/build/install/$PREFIX'," + substituteInPlace swift/benchmark/scripts/build_script_helper.py \ + --replace \ + "swiftbuild_path = os.path.join(args.toolchain, \"usr\", \"bin\", \"swift-build\")" \ + "swiftbuild_path = os.path.join(args.toolchain, \"bin\", \"swift-build\")" substituteInPlace swift-corelibs-xctest/build_script.py \ --replace usr "$PREFIX" - substituteInPlace swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c \ - --replace "if !TARGET_OS_ANDROID" "if TARGET_OS_MAC || TARGET_OS_BSD" - substituteInPlace swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c \ - --replace "if !TARGET_OS_ANDROID" "if TARGET_OS_MAC || TARGET_OS_BSD" ''; configurePhase = '' @@ -265,17 +294,15 @@ stdenv.mkDerivation { ''; buildPhase = '' - # explicitly include C++ headers to prevent errors where stdlib.h is not found from cstdlib - export NIX_CFLAGS_COMPILE="$(< ${clang}/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE" - # During the Swift build, a full local LLVM build is performed and the resulting clang is invoked. - # This compiler is not using the Nix wrappers, so it needs some help to find things. - export NIX_LDFLAGS_BEFORE="-rpath ${gccForLibs.lib}/lib -L${gccForLibs.lib}/lib $NIX_LDFLAGS_BEFORE" - # However, we want to use the wrapped compiler whenever possible. - export CC="${clang}/bin/clang" + # Explicitly include C++ headers to prevent errors where stdlib.h is not found from cstdlib. + export NIX_CFLAGS_COMPILE="$(< ${clang_10}/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE" - # fix for https://bugs.llvm.org/show_bug.cgi?id=39743 - # see also https://forums.swift.org/t/18138/15 - export CCC_OVERRIDE_OPTIONS="#x-fmodules s/-fmodules-cache-path.*//" + # During the Swift build, a full local LLVM build is performed and the resulting clang is + # invoked. This compiler is not using the Nix wrappers, so it needs some help to find things. + export NIX_LDFLAGS_BEFORE="-rpath ${gccForLibs.lib}/lib -L${gccForLibs.lib}/lib $NIX_LDFLAGS_BEFORE" + + # However, we want to use the wrapped compiler whenever possible. + export CC="${clang_10}/bin/clang" $SWIFT_SOURCE_ROOT/swift/utils/build-script \ --preset=buildbot_linux \ @@ -290,14 +317,31 @@ stdenv.mkDerivation { checkInputs = [ file ]; checkPhase = '' - # FIXME: disable non-working tests - rm $SWIFT_SOURCE_ROOT/swift/test/Driver/static-stdlib-linux.swift # static linkage of libatomic.a complains about missing PIC - rm $SWIFT_SOURCE_ROOT/swift/validation-test/Python/build_swift.swift # install_prefix not passed properly + # Remove compiler build system tests which fail due to our modified default build profile and + # nixpkgs-provided version of CMake. + rm $SWIFT_SOURCE_ROOT/swift/validation-test/BuildSystem/infer_implies_install_all.test + rm $SWIFT_SOURCE_ROOT/swift/validation-test/BuildSystem/infer_dumps_deps_if_verbose_build.test - # match the swift wrapper in the install phase - export LIBRARY_PATH=${icu}/lib:${libuuid.out}/lib + # This test apparently requires Python 2 (strings are assumed to be bytes-like), but the build + # process overall now otherwise requires Python 3 (which is what we have updated to). A fix PR + # has been submitted upstream. + rm $SWIFT_SOURCE_ROOT/swift/validation-test/SIL/verify_all_overlays.py - checkTarget=check-swift-all + # TODO: consider fixing and re-adding. This test fails due to a non-standard "install_prefix". + rm $SWIFT_SOURCE_ROOT/swift/validation-test/Python/build_swift.swift + + # We cannot handle the SDK location being in "Weird Location" due to Nix isolation. + rm $SWIFT_SOURCE_ROOT/swift/test/DebugInfo/compiler-flags.swift + + # TODO: Fix issue with ld.gold invoked from script finding crtbeginS.o and crtendS.o. + rm $SWIFT_SOURCE_ROOT/swift/test/IRGen/ELF-remove-autolink-section.swift + + # TODO: consider using stress-tester and integration-test. + + # Match the wrapped version of Swift to be installed. + export LIBRARY_PATH=${icu}/lib:${libgcc}/lib:${libuuid.out}/lib:$l + + checkTarget=check-swift-all-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name} ninjaFlags='-C buildbot_linux/swift-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}' ninjaCheckPhase ''; @@ -305,19 +349,26 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out - # Extract the generated tarball into the store + # Extract the generated tarball into the store. tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 ''${out/#\/} find $out -type d -empty -delete - # fix installation weirdness, also present in Apple’s official tarballs + # Fix installation weirdness, also present in Apple’s official tarballs. mv $out/local/include/indexstore $out/include rmdir $out/local/include $out/local rm -r $out/bin/sdk-module-lists $out/bin/swift-api-checker.py wrapProgram $out/bin/swift \ + --set CC $out/bin/clang \ --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \ - --suffix LIBRARY_PATH : ${icu}/lib:${libuuid.out}/lib + --suffix LIBRARY_PATH : ${icu}/lib:${libgcc}/lib:${libuuid.out}/lib + + wrapProgram $out/bin/swiftc \ + --set CC $out/bin/clang \ + --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ + --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \ + --suffix LIBRARY_PATH : ${icu}/lib:${libgcc}/lib:${libuuid.out}/lib ''; # Hack to avoid build and install directories in RPATHs. @@ -326,14 +377,11 @@ stdenv.mkDerivation { meta = with lib; { description = "The Swift Programming Language"; homepage = "https://github.com/apple/swift"; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ dtzWill trepetti ]; license = licenses.asl20; - # Swift doesn't support 32bit Linux, unknown on other platforms. + # Swift doesn't support 32-bit Linux, unknown on other platforms. platforms = platforms.linux; badPlatforms = platforms.i686; - broken = true; # 2021-01-29 - knownVulnerabilities = [ - "CVE-2020-9861" - ]; + timeout = 86400; # 24 hours. }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch index 60b2996b34..6c42921cd2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch @@ -2,12 +2,12 @@ Don't build Ninja, we use our own. --- a/utils/build-presets.ini +++ b/utils/build-presets.ini -@@ -745,7 +745,7 @@ swiftpm - +@@ -779,7 +779,7 @@ swiftpm + dash-dash - + -build-ninja +# build-ninja + install-llvm install-swift install-lldb - install-llbuild diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch index 5ca6bf1354..0b4c2cc55c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch @@ -1,8 +1,8 @@ -allow custom install prefix +Use custom install prefix. ---- a/utils/build-presets.ini 2019-04-11 14:51:40.060259462 +0200 -+++ b/utils/build-presets.ini 2019-04-11 15:16:17.471137969 +0200 -@@ -752,7 +752,7 @@ +--- a/utils/build-presets.ini ++++ b/utils/build-presets.ini +@@ -788,7 +788,7 @@ install-swiftpm install-xctest install-libicu diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch index 0a66af9e51..7d626e1877 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch @@ -1,17 +1,17 @@ Disable targets, where we use Nix packages. ---- a/utils/build-presets.ini 2019-04-11 15:19:57.845178834 +0200 -+++ b/utils/build-presets.ini 2019-04-11 15:27:42.041297057 +0200 -@@ -740,8 +740,6 @@ +--- a/utils/build-presets.ini ++++ b/utils/build-presets.ini +@@ -776,8 +776,6 @@ llbuild swiftpm xctest -libicu -libcxx - + dash-dash - -@@ -751,9 +749,7 @@ + +@@ -785,9 +785,7 @@ install-llbuild install-swiftpm install-xctest diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch index 304b53a1db..3cacdfc0c5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch @@ -1,11 +1,11 @@ -plumb extra-cmake-options +Plumb extra-cmake-options. --- a/utils/build-presets.ini +++ b/utils/build-presets.ini -@@ -766,6 +766,8 @@ install-destdir=%(install_destdir)s +@@ -812,6 +812,8 @@ # Path to the .tar.gz package we would create. installable-package=%(installable_package)s - + +extra-cmake-options=%(extra_cmake_options)s + [preset: buildbot_linux] diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0005-clang-toolchain-dir.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0005-clang-toolchain-dir.patch new file mode 100644 index 0000000000..40d7728cf7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0005-clang-toolchain-dir.patch @@ -0,0 +1,13 @@ +Use the Nix include dirs and gcc runtime dir, when no sysroot is configured. + +--- a/lib/Driver/ToolChains/Linux.cpp ++++ b/lib/Driver/ToolChains/Linux.cpp +@@ -574,7 +574,7 @@ + + // Check for configure-time C include directories. + StringRef CIncludeDirs(C_INCLUDE_DIRS); +- if (CIncludeDirs != "") { ++ if (CIncludeDirs != "" && (SysRoot.empty() || SysRoot == "/")) { + SmallVector dirs; + CIncludeDirs.split(dirs, ":"); + for (StringRef dir : dirs) { diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0006-clang-purity.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0006-clang-purity.patch new file mode 100644 index 0000000000..928c1db6de --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0006-clang-purity.patch @@ -0,0 +1,16 @@ +Apply the "purity" patch (updated for 5.4.2). + +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -488,11 +488,5 @@ + if (Args.hasArg(options::OPT_rdynamic)) + CmdArgs.push_back("-export-dynamic"); +- +- if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE) { +- CmdArgs.push_back("-dynamic-linker"); +- CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) + +- ToolChain.getDynamicLinker(Args))); +- } + } + + CmdArgs.push_back("-o"); diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch deleted file mode 100644 index c05db52080..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch +++ /dev/null @@ -1,13 +0,0 @@ -The Nix glibc headers do not use include/x86_64-linux-gnu subdirectories. - ---- swift/stdlib/public/Platform/CMakeLists.txt 2019-04-09 20:14:44.493801403 +0200 -+++ swift/stdlib/public/Platform/CMakeLists.txt 2019-04-09 20:14:44.577800593 +0200 -@@ -77,7 +77,7 @@ - endif() - - set(GLIBC_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}") -- set(GLIBC_ARCH_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_ARCH_INCLUDE_PATH}") -+ set(GLIBC_ARCH_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}") - - if(NOT "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}" STREQUAL "/" AND NOT "${sdk}" STREQUAL "ANDROID") - set(GLIBC_INCLUDE_PATH "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}${GLIBC_INCLUDE_PATH}") diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/llvm-toolchain-dir.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/patches/llvm-toolchain-dir.patch deleted file mode 100644 index c22b5c820c..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/llvm-toolchain-dir.patch +++ /dev/null @@ -1,24 +0,0 @@ -Use the Nix include dirs and gcc runtime dir, when no sysroot is configured. - ---- clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:01:15.731109551 +0200 -+++ clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:00:27.959509924 +0200 -@@ -665,7 +665,7 @@ - - // Check for configure-time C include directories. - StringRef CIncludeDirs(C_INCLUDE_DIRS); -- if (CIncludeDirs != "") { -+ if (CIncludeDirs != "" && (SysRoot.empty() || SysRoot == "/")) { - SmallVector dirs; - CIncludeDirs.split(dirs, ":"); - for (StringRef dir : dirs) { ---- clang/lib/Driver/ToolChains/Gnu.cpp 2019-10-26 09:49:27.003752743 +0200 -+++ clang/lib/Driver/ToolChains/Gnu.cpp 2019-10-26 09:50:49.067236497 +0200 -@@ -1743,7 +1743,7 @@ - // If we have a SysRoot, ignore GCC_INSTALL_PREFIX. - // GCC_INSTALL_PREFIX specifies the gcc installation for the default - // sysroot and is likely not valid with a different sysroot. -- if (!SysRoot.empty()) -+ if (!(SysRoot.empty() || SysRoot == "/")) - return ""; - - return GCC_INSTALL_PREFIX; diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/swift-llvm.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/patches/swift-llvm.patch deleted file mode 100644 index fcd9533fd7..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/swift-llvm.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -index bc6675bf4..2f3514b64 100644 ---- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -@@ -1129,8 +1129,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); - CHECK_SIZE_AND_OFFSET(ipc_perm, gid); - CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); - CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); --#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) --/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ -+#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) -+/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit -+ on many architectures. */ - CHECK_SIZE_AND_OFFSET(ipc_perm, mode); - #endif - -diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h -index de69852d3..652d5cb3b 100644 ---- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h -+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -204,26 +204,13 @@ namespace __sanitizer { - u64 __unused1; - u64 __unused2; - #elif defined(__sparc__) --#if defined(__arch64__) - unsigned mode; -- unsigned short __pad1; --#else -- unsigned short __pad1; -- unsigned short mode; - unsigned short __pad2; --#endif - unsigned short __seq; - unsigned long long __unused1; - unsigned long long __unused2; --#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__) -- unsigned int mode; -- unsigned short __seq; -- unsigned short __pad1; -- unsigned long __unused1; -- unsigned long __unused2; - #else -- unsigned short mode; -- unsigned short __pad1; -+ unsigned int mode; - unsigned short __seq; - unsigned short __pad2; - #if defined(__x86_64__) && !defined(_LP64) diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/swift-package-manager-glibc-2.30.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/patches/swift-package-manager-glibc-2.30.patch deleted file mode 100644 index 14ef384976..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/swift-package-manager-glibc-2.30.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/Sources/Basic/Process.swift b/Sources/Basic/Process.swift -index f388c769..8f208691 100644 ---- a/Sources/Basic/Process.swift -+++ b/Sources/Basic/Process.swift -@@ -322,7 +322,10 @@ public final class Process: ObjectIdentifierProtocol { - defer { posix_spawn_file_actions_destroy(&fileActions) } - - // Workaround for https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=89e435f3559c53084498e9baad22172b64429362 -- let devNull = strdup("/dev/null") -+ // Change allowing for newer version of glibc -+ guard let devNull = strdup("/dev/null") else { -+ throw SystemError.posix_spawn(0, arguments) -+ } - defer { free(devNull) } - // Open /dev/null as stdin. - posix_spawn_file_actions_addopen(&fileActions, 0, devNull, O_RDONLY, 0) -@@ -348,7 +351,7 @@ public final class Process: ObjectIdentifierProtocol { - - let argv = CStringArray(arguments) - let env = CStringArray(environment.map({ "\($0.0)=\($0.1)" })) -- let rv = posix_spawnp(&processID, argv.cArray[0], &fileActions, &attributes, argv.cArray, env.cArray) -+ let rv = posix_spawnp(&processID, argv.cArray[0]!, &fileActions, &attributes, argv.cArray, env.cArray) - - guard rv == 0 else { - throw SystemError.posix_spawn(rv, arguments) diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/purity.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/purity.patch deleted file mode 100644 index 4133e89c28..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/purity.patch +++ /dev/null @@ -1,18 +0,0 @@ -"purity" patch for 5.0 - ---- a/lib/Driver/ToolChains/Gnu.cpp -+++ b/lib/Driver/ToolChains/Gnu.cpp -@@ -402,13 +402,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, - if (!Args.hasArg(options::OPT_static)) { - if (Args.hasArg(options::OPT_rdynamic)) - CmdArgs.push_back("-export-dynamic"); -- -- if (!Args.hasArg(options::OPT_shared)) { -- const std::string Loader = -- D.DyldPrefix + ToolChain.getDynamicLinker(Args); -- CmdArgs.push_back("-dynamic-linker"); -- CmdArgs.push_back(Args.MakeArgString(Loader)); -- } - } - - CmdArgs.push_back("-o"); diff --git a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix index bd001d5a10..8f93a6746e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -69,7 +69,7 @@ let # so that it can be used to regenerate documentation. patches = lib.optionals disableGraphviz [ graphvizPatch ./gvc-compat.patch ]; configureFlags = lib.optional disableGraphviz "--disable-graphviz"; - preBuild = lib.optional disableGraphviz "buildFlagsArray+=(\"VALAC=$(pwd)/compiler/valac\")"; + preBuild = lib.optionalString disableGraphviz "buildFlagsArray+=(\"VALAC=$(pwd)/compiler/valac\")"; outputs = [ "out" "devdoc" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix index e483fbe293..7a733ce2cb 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+4272"; + version = "0.9+4276"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "83c0f82dc842fc859dfb4b19e766b23f965cfbb3"; - sha256 = "08lyx2fp34fvnv0lj77r5v3s9a0zr32ywpcz0v8i6wwscjfbp8ba"; + rev = "75a4cdfc8afc10fed80e43fb1ba31c7edaf6e361"; + sha256 = "13xb7ny6i0kr6z6xkj9wmmcj551si7w05r3cghq8h8wkikyh6c8p"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/bluespec.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/bluespec.nix index 58fef968e4..6e436cd004 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/bluespec.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/bluespec.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { pname = "yosys-bluespec"; - version = "2021.01.17"; + version = "2021.08.19"; src = fetchFromGitHub { owner = "thoughtpolice"; repo = "yosys-bluespec"; - rev = "3cfa22c2810b840f406610efe3d7657477c1b0ed"; - sha256 = "1r48128yisw5lpziaj3hq88acghwi94pvm4735xajx8dl79jkcng"; + rev = "bcea1635c97747acd3bcb5b8f1968b3f57ae62bc"; + sha256 = "0ipx9yjngs3haksdb440wlydviszwqnxgzynpp7yic2x3ai7i8m1"; }; buildInputs = [ yosys readline zlib bluespec ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix index 3e36f77dab..f2b2961c4c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix @@ -54,4 +54,9 @@ rec { inherit callPackage; }; + luajit_openresty = import ../luajit/openresty.nix { + self = luajit_openresty; + inherit callPackage; + }; + } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix b/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix index 153b11aaa5..ceb796f043 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix @@ -1,6 +1,8 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; + owner = "LuaJIT"; + repo = "LuaJIT"; version = "2.0.5-2021-06-08"; rev = "98f95f69180d48ce49289d6428b46a9ccdd67a46"; isStable = true; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix b/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix index d11514c07c..87976a45df 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix @@ -1,6 +1,8 @@ { self, callPackage }: callPackage ./default.nix { inherit self; + owner = "LuaJIT"; + repo = "LuaJIT"; version = "2.1.0-2021-06-25"; rev = "e957737650e060d5bf1c2909b741cc3dffe073ac"; isStable = false; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix index 860642b0fd..7281615982 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, fetchFromGitHub, buildPackages , name ? "luajit-${version}" , isStable +, owner +, repo , sha256 , rev , version @@ -41,9 +43,7 @@ in stdenv.mkDerivation rec { inherit name version; src = fetchFromGitHub { - owner = "LuaJIT"; - repo = "LuaJIT"; - inherit sha256 rev; + inherit owner repo sha256 rev; }; luaversion = "5.1"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/luajit/openresty.nix b/third_party/nixpkgs/pkgs/development/interpreters/luajit/openresty.nix new file mode 100644 index 0000000000..78e06f46f1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/luajit/openresty.nix @@ -0,0 +1,10 @@ +{ self, callPackage }: +callPackage ./default.nix rec { + inherit self; + owner = "openresty"; + repo = "luajit2"; + version = "2.1-20210510"; + rev = "v${version}"; + isStable = true; + sha256 = "1h21w5axwka2j9jb86yc69qrprcavccyr2qihiw4b76r1zxzalvd"; +} diff --git a/third_party/nixpkgs/pkgs/development/java-modules/m2install.nix b/third_party/nixpkgs/pkgs/development/java-modules/m2install.nix index 3a289c9c9c..d0a13f6252 100644 --- a/third_party/nixpkgs/pkgs/development/java-modules/m2install.nix +++ b/third_party/nixpkgs/pkgs/development/java-modules/m2install.nix @@ -12,10 +12,10 @@ let in stdenv.mkDerivation { inherit name m2Path m2File src; + dontUnpack = true; + installPhase = '' mkdir -p $out/m2/$m2Path cp $src $out/m2/$m2Path/$m2File ''; - - phases = "installPhase"; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix index a0f770178c..3c7c133199 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix @@ -12,8 +12,18 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 libpng libjpeg libtiff giflib libwebp libXpm zlib ] ++ lib.optional stdenv.isDarwin Foundation; - - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; + configureFlags = [ + # Disable dynamically loaded dependencies + "--disable-jpg-shared" + "--disable-png-shared" + "--disable-tif-shared" + "--disable-webp-shared" + ] ++ lib.optionals stdenv.isDarwin [ + # Darwin headless will hang when trying to run the SDL test program + "--disable-sdltest" + # Don't use native macOS frameworks + "--disable-imageio" + ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index e7cbd0f006..05174c89f7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q3.2"; + version = "2021.Q3.4"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "q860VD6hUs1U9mlkj/vqkLT/4zqGqQl4JI/flyDwhC8="; + sha256 = "Rmx5vicxKXstI8TdxeFVjEFe71XJOyzp5L6VyDNuXmM="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/appstream-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/appstream-glib/default.nix index 558ea51eb0..5882805fdf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/appstream-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/appstream-glib/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "hughsie"; repo = "appstream-glib"; - rev = "${lib.replaceStrings ["-"] ["_"] pname}-${lib.replaceStrings ["."] ["_"] version}"; + rev = "${lib.replaceStrings ["-"] ["_"] pname}_${lib.replaceStrings ["."] ["_"] version}"; sha256 = "12s7d3nqjs1fldnppbg2mkjg4280f3h8yzj3q1hiz3chh1w0vjbx"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aspell/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aspell/default.nix index 01acced98f..777bad1e5a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aspell/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aspell/default.nix @@ -23,7 +23,14 @@ stdenv.mkDerivation rec { sha256 = "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr"; }; - patches = lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch; + patches = [ + (fetchpatch { + # objstack: assert that the alloc size will fit within a chunk + name = "CVE-2019-25051.patch"; + url = "https://github.com/gnuaspell/aspell/commit/0718b375425aad8e54e1150313b862e4c6fd324a.patch"; + sha256 = "03z259xrk41x3j190gaprf3mqysyfgh3a04rjmch3h625vj95x39"; + }) + ] ++ lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch; postPatch = '' patch interfaces/cc/aspell.h < ${./clang.patch} diff --git a/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix index 515c60c985..8413ae597f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.40.2"; + version = "2.40.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "RNwXr5Q7D9GWxhweA7bBZpYDhcrpbMtelb3v/7aEn5g="; + sha256 = "5Jg3wq0w1x4fKcqOCWilS5UDAnL3/0C4m0iWhlPzelw="; }; outputs = [ "out" "dev" ]; 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 062a05e64a..ae47959dd3 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 @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , cmake +, coreutils }: stdenv.mkDerivation rec { @@ -22,6 +23,13 @@ stdenv.mkDerivation rec { "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ]; + # Prevent the execution of tests known to be flaky. + preCheck = '' + cat <CTestCustom.cmake + SET(CTEST_CUSTOM_TESTS_IGNORE promise_test_multiple_waiters) + EOW + ''; + doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix index 1a42211b93..c1d2813a4f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "4.5.20"; + version = "5.0.0"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-n/S0G7dGaDWWsvOITceITmWUNpebcHMedkLTklxGjQg="; + sha256 = "sha256-/jv59ZeELfP7PokzthvZNL4FS3tyzRmCHp4I/Lp8BJM="; }; # Do not build static libraries diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/1.71.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/1.71.nix deleted file mode 100644 index bec741dd88..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/boost/1.71.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "1.71.0"; - - src = fetchurl { - #url = "mirror://sourceforge/boost/boost_1_71_0.tar.bz2"; - urls = [ - "mirror://sourceforge/boost/boost_1_71_0.tar.bz2" - "https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2" - ]; - # SHA256 from http://www.boost.org/users/history/version_1_71_0.html - sha256 = "d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee"; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix index f18a7e94f0..414194acb8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -42,6 +42,16 @@ in stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/cairo/cairo/commit/5e34c5a9640e49dcc29e6b954c4187cfc838dbd1.patch"; sha256 = "yCwsDUY7efVvOZkA6a0bPS+RrVc8Yk9bfPwWHeOjq5o="; }) + + # Fixes CVE-2020-35492; see https://github.com/NixOS/nixpkgs/issues/120364. + # CVE information: https://nvd.nist.gov/vuln/detail/CVE-2020-35492 + # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/merge_requests/85 + (fetchpatch { + name = "CVE-2020-35492.patch"; + includes = [ "src/cairo-image-compositor.c" ]; + url = "https://github.com/freedesktop/cairo/commit/78266cc8c0f7a595cfe8f3b694bfb9bcc3700b38.patch"; + sha256 = "048nzfz7rkgqb9xs0dfs56qdw7ckkxr87nbj3p0qziqdq4nb6wki"; + }) ] ++ optionals stdenv.hostPlatform.isDarwin [ # Workaround https://gitlab.freedesktop.org/cairo/cairo/-/issues/121 ./skip-configure-stderr-check.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/codec2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/codec2/default.nix index 88b35f16c3..a860470af3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/codec2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/codec2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "codec2"; - version = "0.9.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "drowe67"; repo = "codec2"; rev = "v${version}"; - sha256 = "1jpvr7bra8srz8jvnlbmhf8andbaavq5v01qjnp2f61za93rzwba"; + sha256 = "sha256-R4H6gwmc8nPgRfhNms7n7jMCHhkzX7i/zfGT4CYSsY8="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/1.12.nix b/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/1.12.nix index df2980ba20..1ad490d3a0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/1.12.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/1.12.nix @@ -20,7 +20,7 @@ callPackage ./generic.nix { }) ]; - preConfigure = lib.optional stdenv.buildPlatform.isDarwin '' + preConfigure = lib.optionalString stdenv.buildPlatform.isDarwin '' rm BUILD ''; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/ftxui/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ftxui/default.nix new file mode 100644 index 0000000000..df664a309a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/ftxui/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, doxygen +, graphviz +}: + +stdenv.mkDerivation rec { + pname = "ftxui"; + version = "unstable-2021-08-13"; + + src = fetchFromGitHub { + owner = "ArthurSonzogni"; + repo = pname; + rev = "69b0c9e53e523ac43a303964fc9c5bc0da7d5d61"; + sha256 = "0cbljksgy1ckw34h0mq70s8sma0p16sznn4z9r4hwv76y530m0ww"; + }; + + nativeBuildInputs = [ + cmake + doxygen + graphviz + ]; + + meta = with lib; { + homepage = "https://github.com/ArthurSonzogni/FTXUI"; + description = "Functional Terminal User Interface for C++"; + license = licenses.mit; + maintainers = [ maintainers.ivar ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix index d15ce77213..ffe8553868 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, cmake, ninja, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, cmake, ninja, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "gtest"; - version = "1.10.0"; + version = "1.11.0"; outputs = [ "out" "dev" ]; @@ -10,16 +10,11 @@ stdenv.mkDerivation rec { owner = "google"; repo = "googletest"; rev = "release-${version}"; - sha256 = "1zbmab9295scgg4z2vclgfgjchfjailjnvzc6f5x9jvlsdi3dpwz"; + hash = "sha256-SjlJxushfry13RGA7BCjYC9oZqV4z6x8dOiHfl/wpF0="; }; patches = [ ./fix-cmake-config-includedir.patch - (fetchpatch { - name = "fix-pkgconfig-paths.patch"; - url = "https://github.com/google/googletest/commit/5126ff48d9ac54828d1947d1423a5ef2a8efee3b.patch"; - sha256 = "sha256-TBvECU/9nuvwjsCjWJP2b6DNy+FYnHIFZeuVW7g++JE="; - }) ]; nativeBuildInputs = [ cmake ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/imath/default.nix b/third_party/nixpkgs/pkgs/development/libraries/imath/default.nix new file mode 100644 index 0000000000..7950667c19 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/imath/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "imath"; + version = "3.0.5"; + + src = fetchFromGitHub { + owner = "AcademySoftwareFoundation"; + repo = "imath"; + rev = "v${version}"; + sha256 = "0nwf8622j01p699nkkbal6xxs1snzzhz4cn6d76yppgvdhgyahsc"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Imath is a C++ and python library of 2D and 3D vector, matrix, and math operations for computer graphics"; + homepage = "https://github.com/AcademySoftwareFoundation/Imath"; + license = licenses.bsd3; + maintainers = with maintainers; [ paperdigits ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index 7cc25ec3fa..b8f4d592b6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.3.1"; + version = "21.3.2"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "0f6lgnca68aj9gdbxla2mwgap33ksdgiss0m7dk35r0slgf0hdxr"; + sha256 = "0d2w1wmq6w2hjyja7zn9f3glykk14mvphj00dbqkbsla311gkqw4"; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/itk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/itk/default.nix index d84b9f1df6..967910e2a1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/itk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/itk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "itk"; - version = "5.2.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "InsightSoftwareConsortium"; repo = "ITK"; rev = "v${version}"; - sha256 = "19f65fc9spwvmywg43lkw9p2inrrzr1qrfzcbing3cjk0x2yrsnl"; + sha256 = "sha256-KaVe9FMGm4ZVMpwAT12fA67T0qZS3ZueiI8z85+xSwE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix index aac75fcc22..f61c0bfafc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix @@ -8,7 +8,10 @@ stdenv.mkDerivation rec { sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"; }; - configureFlags = lib.optional stdenv.is64bit "--enable-64bit"; + configureFlags = lib.optional stdenv.is64bit "--enable-64bit" + # libantlr3c wrongly emits the abi flags -m64 and -m32 which imply x86 archs + # https://github.com/antlr/antlr3/issues/205 + ++ lib.optional (!stdenv.hostPlatform.isx86) "--disable-abiflags"; meta = with lib; { description = "C runtime libraries of ANTLR v3"; @@ -16,12 +19,5 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ vbgl ]; - # The package failed to build with error: - # gcc: error: unrecognized command line option '-m64' - # - # See: - # https://gist.github.com/r-rmcgibbo/15bf2ca9b297e8357887e146076fff7d - # https://gist.github.com/r-rmcgibbo/a362535e4b174d4bfb68112503a49fcd - broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libedit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libedit/default.nix index daf0f29284..35efdc781d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libedit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libedit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libedit"; - version = "20210522-3.1"; + version = "20210714-3.1"; src = fetchurl { url = "https://thrysoee.dk/editline/${pname}-${version}.tar.gz"; - sha256 = "sha256-AiC8IEfpJ8DBmE7197TrKpRppbe/ErpXPKOyPKAru28="; + sha256 = "sha256-MCO0mK1ZP9d0WuOyCrrVRt5Qa2e4+7VXljfKaauC28k="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libemf2svg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libemf2svg/default.nix new file mode 100644 index 0000000000..4bb7caa026 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libemf2svg/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, fontconfig +, freetype +, libpng +}: + +stdenv.mkDerivation rec { + pname = "libemf2svg"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "kakwa"; + repo = pname; + rev = version; + sha256 = "04g6dp5xadszqjyjl162x26mfhhwinia65hbkl3mv70bs4an9898"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ fontconfig freetype libpng ]; + + meta = with lib; { + description = "Microsoft EMF to SVG conversion library"; + homepage = "https://github.com/kakwa/libemf2svg"; + maintainers = with maintainers; [ erdnaxe ]; + license = licenses.gpl2Only; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libffi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libffi/default.nix index 48611dffb0..4332f43c5a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libffi/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "libffi"; - version = "3.3"; + version = "3.4.2"; src = fetchurl { - url = "https://sourceware.org/pub/libffi/${pname}-${version}.tar.gz"; - sha256 = "0mi0cpf8aa40ljjmzxb7im6dbj45bb0kllcd09xgmp834y9agyvj"; + url = "https://github.com/libffi/libffi/releases/download/v${version}/${pname}-${version}.tar.gz"; + sha256 = "081nx7wpzds168jbr59m34n6s3lyiq6r8zggvqxvlslsc4hvf3sl"; }; patches = []; @@ -24,6 +24,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc-arch=generic" # no detection of -march= or -mtune= "--enable-pax_emutramp" + + # Causes issues in downstream packages which misuse ffi_closure_alloc + # Reenable once these issues are fixed and merged: + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6155 + # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/283 + "--disable-exec-static-tramp" ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfm/default.nix index 255ddfa22a..5d7389b6d1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfm/default.nix @@ -13,7 +13,7 @@ let gtk = if withGtk3 then gtk3 else gtk2; - inherit (lib) optional; + inherit (lib) optional optionalString; in stdenv.mkDerivation rec { pname = if extraOnly @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; # libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm - postInstall = optional (!extraOnly) '' + postInstall = optionalString (!extraOnly) '' rm $out/lib/libfm-extra.so $out/lib/libfm-extra.so.* $out/lib/libfm-extra.la $out/lib/pkgconfig/libfm-extra.pc ''; 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 8121074f84..e46e255933 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix @@ -1,5 +1,4 @@ { stdenv, lib, buildPackages, fetchurl, gettext -, fetchpatch , genPosixLockObjOnly ? false }: let genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly { @@ -25,14 +24,9 @@ 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"; - }) - ]; + # 1.42 breaks (some?) cross-compilation (e.g. x86_64 -> aarch64). + # Backporting this fix (merged in upstream master but no release cut) by David Michael https://dev.gnupg.org/rE33593864cd54143db594c4237bba41e14179061c + patches = [ ./fix-1.42-cross-compilation.patch ]; postPatch = '' sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/fix-1.42-cross-compilation.patch b/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/fix-1.42-cross-compilation.patch new file mode 100644 index 0000000000..6c3099f721 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/fix-1.42-cross-compilation.patch @@ -0,0 +1,142 @@ +diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh +index a710f0c..258eec6 100755 +--- a/src/gen-lock-obj.sh ++++ b/src/gen-lock-obj.sh +@@ -1,136 +1,136 @@ + #! /bin/sh + # + # gen-lock-obj.sh - Build tool to construct the lock object. + # + # Copyright (C) 2020, 2021 g10 Code GmbH + # + # This file is part of libgpg-error. + # + # libgpg-error is free software; you can redistribute it and/or + # modify it under the terms of the GNU Lesser General Public License + # as published by the Free Software Foundation; either version 2.1 of + # the License, or (at your option) any later version. + # + # libgpg-error is distributed in the hope that it will be useful, but + # WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + # Lesser General Public License for more details. + # + # You should have received a copy of the GNU Lesser General Public + # License along with this program; if not, see . + # + + # + # Following variables should be defined to invoke this script + # + # CC + # OBJDUMP + # AWK + # ac_ext + # ac_object + # host + # LOCK_ABI_VERSION + # + # An example: + # + # LOCK_ABI_VERSION=1 host=x86_64-pc-linux-gnu host_alias=x86_64-linux-gnu \ + # CC=$host_alias-gcc OBJDUMP=$host_alias-objdump ac_ext=c ac_objext=o \ + # AWK=gawk ./gen-lock-obj.sh + # + +-if test -n `echo -n`; then ++if test -n "`echo -n`"; then + ECHO_C='\c' + ECHO_N='' + else + ECHO_C='' + ECHO_N='-n' + fi + + if test "$1" = --disable-threads; then + cat <conftest.$ac_ext + #include + pthread_mutex_t mtx = PTHREAD_MUTEX_INITIALIZER; + EOF + + if $CC -c conftest.$ac_ext; then : + ac_mtx_size=$($OBJDUMP -j .bss -t conftest.$ac_objext \ + | $AWK $AWK_OPTION ' + /mtx$/ { mtx_size = int("0x" $5) } + END { print mtx_size }') + else + echo "Can't determine mutex size" + exit 1 + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + cat < dconf != null; @@ -32,53 +32,43 @@ assert withGtk3 -> gtk3 != null; let compareVersion = v: builtins.compareVersions version v; - qmakeCacheName = - if compareVersion "5.12.4" < 0 then ".qmake.cache" else ".qmake.stash"; + qmakeCacheName = if compareVersion "5.12.4" < 0 then ".qmake.cache" else ".qmake.stash"; debugSymbols = debug || developerBuild; in stdenv.mkDerivation { - - name = "qtbase-${version}"; + pname = "qtbase"; inherit qtCompatVersion src version; debug = debugSymbols; - propagatedBuildInputs = - [ - libxml2 libxslt openssl sqlite zlib + propagatedBuildInputs = [ + libxml2 libxslt openssl sqlite zlib + + # Text rendering + harfbuzz icu + + # Image formats + libjpeg libpng + (if compareVersion "5.9.0" < 0 then pcre16 else pcre2) + ] ++ ( + if stdenv.isDarwin then [ + # TODO: move to buildInputs, this should not be propagated. + AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth + CoreLocation CoreServices DiskArbitration Foundation OpenGL + libobjc libiconv MetalKit IOKit + ] else [ + dbus glib udev # Text rendering - harfbuzz icu + fontconfig freetype - # Image formats - libjpeg libpng - (if compareVersion "5.9.0" < 0 then pcre16 else pcre2) - ] - ++ ( - if stdenv.isDarwin - then with darwin.apple_sdk.frameworks; - [ - # TODO: move to buildInputs, this should not be propagated. - AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth - CoreLocation CoreServices DiskArbitration Foundation OpenGL - darwin.libobjc libiconv MetalKit IOKit - ] - else - [ - dbus glib udev + # X11 libs + libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil + xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm + ] ++ lib.optional libGLSupported libGL + ); - # Text rendering - fontconfig freetype - - # X11 libs - libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil - xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm - ] - ++ lib.optional libGLSupported libGL - ); - - buildInputs = - [ python3 ] + buildInputs = [ python3 ] ++ lib.optionals (!stdenv.isDarwin) ( [ libinput ] @@ -89,8 +79,8 @@ stdenv.mkDerivation { ++ lib.optional (libmysqlclient != null) libmysqlclient ++ lib.optional (postgresql != null) postgresql; - nativeBuildInputs = - [ bison flex gperf lndir perl pkg-config which ]; + nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which ] + ++ lib.optionals stdenv.isDarwin [ xcbuild ]; propagatedNativeBuildInputs = [ lndir ]; @@ -107,59 +97,42 @@ stdenv.mkDerivation { . ${../hooks/fix-qmake-libtool.sh} ''; - postPatch = + postPatch = '' + for prf in qml_plugin.prf qt_plugin.prf qt_docs.prf qml_module.prf create_cmake.prf; do + substituteInPlace "mkspecs/features/$prf" \ + --subst-var qtPluginPrefix \ + --subst-var qtQmlPrefix \ + --subst-var qtDocPrefix + done + + substituteInPlace configure --replace /bin/pwd pwd + substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls + sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i mkspecs/*/*.conf + + sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5Config.cmake.in + sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5CoreMacros.cmake + sed -i 's/NO_DEFAULT_PATH//' src/gui/Qt5GuiConfigExtras.cmake.in + sed -i '/PATHS.*NO_DEFAULT_PATH/ d' mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in + '' + ( + if stdenv.isDarwin then '' + sed -i \ + -e 's|/usr/bin/xcode-select|xcode-select|' \ + -e 's|/usr/bin/xcrun|xcrun|' \ + -e 's|/usr/bin/xcodebuild|xcodebuild|' \ + -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \ + ./configure + substituteInPlace ./mkspecs/common/mac.conf \ + --replace "/System/Library/Frameworks/OpenGL.framework/" "${OpenGL}/Library/Frameworks/OpenGL.framework/" \ + --replace "/System/Library/Frameworks/AGL.framework/" "${AGL}/Library/Frameworks/AGL.framework/" + '' else lib.optionalString libGLSupported '' + sed -i mkspecs/common/linux.conf \ + -e "/^QMAKE_INCDIR_OPENGL/ s|$|${libGL.dev or libGL}/include|" \ + -e "/^QMAKE_LIBDIR_OPENGL/ s|$|${libGL.out}/lib|" + '' + lib.optionalString (stdenv.hostPlatform.isx86_32 && stdenv.cc.isGNU) '' + sed -i mkspecs/common/gcc-base-unix.conf \ + -e "/^QMAKE_LFLAGS_SHLIB/ s/-shared/-shared -static-libgcc/" '' - for prf in qml_plugin.prf qt_plugin.prf qt_docs.prf qml_module.prf create_cmake.prf; do - substituteInPlace "mkspecs/features/$prf" \ - --subst-var qtPluginPrefix \ - --subst-var qtQmlPrefix \ - --subst-var qtDocPrefix - done - - substituteInPlace configure --replace /bin/pwd pwd - substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls - sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i mkspecs/*/*.conf - - sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5Config.cmake.in - sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5CoreMacros.cmake - sed -i 's/NO_DEFAULT_PATH//' src/gui/Qt5GuiConfigExtras.cmake.in - sed -i '/PATHS.*NO_DEFAULT_PATH/ d' mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in - '' - - + ( - if stdenv.isDarwin - then - '' - sed -i \ - -e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \ - -e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \ - -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot=/nonsense|' \ - -e 's|sysroot=$(/usr/bin/xcrun --sdk $sdk --show-sdk-path 2>/dev/null)|sysroot=/nonsense|' \ - -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \ - -e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \ - -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \ - -e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \ - ./configure - substituteInPlace ./mkspecs/common/mac.conf \ - --replace "/System/Library/Frameworks/OpenGL.framework/" "${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework/" - substituteInPlace ./mkspecs/common/mac.conf \ - --replace "/System/Library/Frameworks/AGL.framework/" "${darwin.apple_sdk.frameworks.AGL}/Library/Frameworks/AGL.framework/" - '' - # Note on the above: \x27 is a way if including a single-quote - # character in the sed string arguments. - else - lib.optionalString libGLSupported - '' - sed -i mkspecs/common/linux.conf \ - -e "/^QMAKE_INCDIR_OPENGL/ s|$|${libGL.dev or libGL}/include|" \ - -e "/^QMAKE_LIBDIR_OPENGL/ s|$|${libGL.out}/lib|" - '' + - lib.optionalString (stdenv.hostPlatform.isx86_32 && stdenv.cc.isGNU) - '' - sed -i mkspecs/common/gcc-base-unix.conf \ - -e "/^QMAKE_LFLAGS_SHLIB/ s/-shared/-shared -static-libgcc/" - '' - ); + ); qtPluginPrefix = "lib/qt-${qtCompatVersion}/plugins"; qtQmlPrefix = "lib/qt-${qtCompatVersion}/qml"; @@ -218,153 +191,128 @@ stdenv.mkDerivation { PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; # TODO Remove obsolete and useless flags once the build will be totally mastered - configureFlags = - [ - "-plugindir $(out)/$(qtPluginPrefix)" - "-qmldir $(out)/$(qtQmlPrefix)" - "-docdir $(out)/$(qtDocPrefix)" + configureFlags = [ + "-plugindir $(out)/$(qtPluginPrefix)" + "-qmldir $(out)/$(qtQmlPrefix)" + "-docdir $(out)/$(qtDocPrefix)" - "-verbose" - "-confirm-license" - "-opensource" + "-verbose" + "-confirm-license" + "-opensource" - "-release" - "-shared" - "-accessibility" - "-optimized-qmake" - "-strip" - "-system-proxies" - "-pkg-config" + "-release" + "-shared" + "-accessibility" + "-optimized-qmake" + "-strip" + "-system-proxies" + "-pkg-config" - "-gui" - "-widgets" - "-opengl desktop" - "-icu" - "-L" "${icu.out}/lib" - "-I" "${icu.dev}/include" - "-pch" - ] - ++ lib.optional debugSymbols "-debug" - ++ lib.optionals (compareVersion "5.11.0" < 0) - [ - "-qml-debug" - ] - ++ lib.optionals (compareVersion "5.9.0" < 0) - [ - "-c++11" - "-no-reduce-relocations" - ] - ++ lib.optionals developerBuild [ - "-developer-build" - "-no-warnings-are-errors" + "-gui" + "-widgets" + "-opengl desktop" + "-icu" + "-L" "${icu.out}/lib" + "-I" "${icu.dev}/include" + "-pch" + ] ++ lib.optional debugSymbols "-debug" + ++ lib.optionals (compareVersion "5.11.0" < 0) [ + "-qml-debug" + ] ++ lib.optionals (compareVersion "5.9.0" < 0) [ + "-c++11" + "-no-reduce-relocations" + ] ++ lib.optionals developerBuild [ + "-developer-build" + "-no-warnings-are-errors" + ] ++ (if (!stdenv.hostPlatform.isx86_64) then [ + "-no-sse2" + ] else lib.optionals (compareVersion "5.9.0" >= 0) [ + "-sse2" + "${lib.optionalString (!stdenv.hostPlatform.sse3Support) "-no"}-sse3" + "${lib.optionalString (!stdenv.hostPlatform.ssse3Support) "-no"}-ssse3" + "${lib.optionalString (!stdenv.hostPlatform.sse4_1Support) "-no"}-sse4.1" + "${lib.optionalString (!stdenv.hostPlatform.sse4_2Support) "-no"}-sse4.2" + "${lib.optionalString (!stdenv.hostPlatform.avxSupport) "-no"}-avx" + "${lib.optionalString (!stdenv.hostPlatform.avx2Support) "-no"}-avx2" ] + ) ++ [ + "-no-mips_dsp" + "-no-mips_dspr2" + ] ++ [ + "-system-zlib" + "-L" "${zlib.out}/lib" + "-I" "${zlib.dev}/include" + "-system-libjpeg" + "-L" "${libjpeg.out}/lib" + "-I" "${libjpeg.dev}/include" + "-system-harfbuzz" + "-L" "${harfbuzz.out}/lib" + "-I" "${harfbuzz.dev}/include" + "-system-pcre" + "-openssl-linked" + "-L" "${openssl.out}/lib" + "-I" "${openssl.dev}/include" + "-system-sqlite" + ''-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql'' + ''-${if postgresql != null then "plugin" else "no"}-sql-psql'' + + "-make libs" + "-make tools" + ''-${lib.optionalString (!buildExamples) "no"}make examples'' + ''-${lib.optionalString (!buildTests) "no"}make tests'' + ] ++ lib.optional (compareVersion "5.15.0" < 0) "-v" ++ ( - if (!stdenv.hostPlatform.isx86_64) then [ - "-no-sse2" - ] else if (compareVersion "5.9.0" >= 0) then [ - "-sse2" - "${if stdenv.hostPlatform.sse3Support then "" else "-no"}-sse3" - "${if stdenv.hostPlatform.ssse3Support then "" else "-no"}-ssse3" - "${if stdenv.hostPlatform.sse4_1Support then "" else "-no"}-sse4.1" - "${if stdenv.hostPlatform.sse4_2Support then "" else "-no"}-sse4.2" - "${if stdenv.hostPlatform.avxSupport then "" else "-no"}-avx" - "${if stdenv.hostPlatform.avx2Support then "" else "-no"}-avx2" - ] else [ - ] - ) - ++ [ - "-no-mips_dsp" - "-no-mips_dspr2" + if stdenv.isDarwin then [ + "-platform macx-clang" + "-no-fontconfig" + "-qt-freetype" + "-qt-libpng" + "-no-framework" + ] else [ + "-${lib.optionalString (compareVersion "5.9.0" < 0) "no-"}rpath" + ] ++ lib.optional (compareVersion "5.15.0" < 0) "-system-xcb" + ++ [ + "-xcb" + "-qpa xcb" + "-L" "${libX11.out}/lib" + "-I" "${libX11.out}/include" + "-L" "${libXext.out}/lib" + "-I" "${libXext.out}/include" + "-L" "${libXrender.out}/lib" + "-I" "${libXrender.out}/include" + + "-libinput" + + ''-${lib.optionalString (cups == null) "no-"}cups'' + "-dbus-linked" + "-glib" + ] ++ lib.optional (compareVersion "5.15.0" < 0) "-system-libjpeg" + ++ [ + "-system-libpng" + ] ++ lib.optional withGtk3 "-gtk" + ++ lib.optional (compareVersion "5.9.0" >= 0) "-inotify" + ++ lib.optionals (compareVersion "5.10.0" >= 0) [ + # Without these, Qt stops working on kernels < 3.17. See: + # https://github.com/NixOS/nixpkgs/issues/38832 + "-no-feature-renameat2" + "-no-feature-getentropy" + ] ++ lib.optionals (compareVersion "5.12.1" < 0) [ + # use -xkbcommon and -xkbcommon-evdev for versions before 5.12.1 + "-system-xkbcommon" + "-xkbcommon-evdev" + ] ++ lib.optionals (cups != null) [ + "-L" "${cups.lib}/lib" + "-I" "${cups.dev}/include" + ] ++ lib.optionals (libmysqlclient != null) [ + "-L" "${libmysqlclient}/lib" + "-I" "${libmysqlclient}/include" ] + ); - ++ [ - "-system-zlib" - "-L" "${zlib.out}/lib" - "-I" "${zlib.dev}/include" - "-system-libjpeg" - "-L" "${libjpeg.out}/lib" - "-I" "${libjpeg.dev}/include" - "-system-harfbuzz" - "-L" "${harfbuzz.out}/lib" - "-I" "${harfbuzz.dev}/include" - "-system-pcre" - "-openssl-linked" - "-L" "${openssl.out}/lib" - "-I" "${openssl.dev}/include" - "-system-sqlite" - ''-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql'' - ''-${if postgresql != null then "plugin" else "no"}-sql-psql'' - - "-make libs" - "-make tools" - ''-${lib.optionalString (!buildExamples) "no"}make examples'' - ''-${lib.optionalString (!buildTests) "no"}make tests'' - ] - ++ lib.optional (compareVersion "5.15.0" < 0) "-v" - - ++ ( - if stdenv.isDarwin - then - [ - "-platform macx-clang" - "-no-fontconfig" - "-qt-freetype" - "-qt-libpng" - "-no-framework" - ] - else - [ - "-${lib.optionalString (compareVersion "5.9.0" < 0) "no-"}rpath" - ] - ++ lib.optional (compareVersion "5.15.0" < 0) "-system-xcb" - ++ [ - "-xcb" - "-qpa xcb" - "-L" "${libX11.out}/lib" - "-I" "${libX11.out}/include" - "-L" "${libXext.out}/lib" - "-I" "${libXext.out}/include" - "-L" "${libXrender.out}/lib" - "-I" "${libXrender.out}/include" - - "-libinput" - - ''-${lib.optionalString (cups == null) "no-"}cups'' - "-dbus-linked" - "-glib" - ] - ++ lib.optional (compareVersion "5.15.0" < 0) "-system-libjpeg" - ++ [ - "-system-libpng" - ] - ++ lib.optional withGtk3 "-gtk" - ++ lib.optional (compareVersion "5.9.0" >= 0) "-inotify" - ++ lib.optionals (compareVersion "5.10.0" >= 0) [ - # Without these, Qt stops working on kernels < 3.17. See: - # https://github.com/NixOS/nixpkgs/issues/38832 - "-no-feature-renameat2" - "-no-feature-getentropy" - ] - ++ lib.optionals (compareVersion "5.12.1" < 0) [ - # use -xkbcommon and -xkbcommon-evdev for versions before 5.12.1 - "-system-xkbcommon" - "-xkbcommon-evdev" - ] - ++ lib.optionals (cups != null) [ - "-L" "${cups.lib}/lib" - "-I" "${cups.dev}/include" - ] - ++ lib.optionals (libmysqlclient != null) [ - "-L" "${libmysqlclient}/lib" - "-I" "${libmysqlclient}/include" - ] - ); - - postInstall = - # Move selected outputs. - '' - moveToOutput "mkspecs" "$dev" - ''; + # Move selected outputs. + postInstall = '' + moveToOutput "mkspecs" "$dev" + ''; devTools = [ "bin/fixqt4headers.pl" @@ -378,35 +326,27 @@ stdenv.mkDerivation { "bin/uic" ]; - postFixup = + postFixup = '' # Don't retain build-time dependencies like gdb. - '' - sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri - '' - - + '' - fixQtModulePaths "''${!outputDev}/mkspecs/modules" - fixQtBuiltinPaths "''${!outputDev}" '*.pr?' - '' + sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri + fixQtModulePaths "''${!outputDev}/mkspecs/modules" + fixQtBuiltinPaths "''${!outputDev}" '*.pr?' # Move development tools to $dev - + '' - moveQtDevTools - moveToOutput bin "$dev" - '' + moveQtDevTools + moveToOutput bin "$dev" # fixup .pc file (where to find 'moc' etc.) - + '' - sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \ - -e "/^host_bins=/ c host_bins=$dev/bin" - ''; + sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \ + -e "/^host_bins=/ c host_bins=$dev/bin" + ''; dontStrip = debugSymbols; setupHook = ../hooks/qtbase-setup-hook.sh; meta = with lib; { - homepage = "http://www.qt.io"; + homepage = "https://www.qt.io/"; description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; maintainers = with maintainers; [ qknight ttuegel periklis bkchr ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix index 97248ca180..89f2672c26 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix @@ -1,7 +1,5 @@ { qtModule, lib, python3, qtbase, qtsvg }: -with lib; - qtModule { pname = "qtdeclarative"; qtInputs = [ qtbase qtsvg ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index 0d2d565fe7..baf5c30e73 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -1,17 +1,24 @@ -{ qtModule, lib, stdenv, qtbase, qtdeclarative, pkg-config -, alsa-lib, gstreamer, gst-plugins-base, libpulseaudio, wayland +{ qtModule +, lib +, stdenv +, qtbase +, qtdeclarative +, pkg-config +, alsa-lib +, gstreamer +, gst-plugins-base +, libpulseaudio +, wayland }: -with lib; - qtModule { pname = "qtmultimedia"; qtInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ gstreamer gst-plugins-base libpulseaudio ] - ++ optional (stdenv.isLinux) alsa-lib - ++ optional (versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland; + ++ lib.optional (stdenv.isLinux) alsa-lib + ++ lib.optional (lib.versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland; outputs = [ "bin" "dev" "out" ]; qmakeFlags = [ "GST_VERSION=1.0" ]; - NIX_LDFLAGS = optionalString (stdenv.isDarwin) "-lobjc"; + NIX_LDFLAGS = lib.optionalString (stdenv.isDarwin) "-lobjc"; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialport.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialport.nix index caeaedbcf3..89d96eb291 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialport.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialport.nix @@ -1,11 +1,7 @@ { qtModule, stdenv, lib, qtbase, systemd }: -let inherit (lib) getLib optional; in - qtModule { pname = "qtserialport"; qtInputs = [ qtbase ]; - NIX_CFLAGS_COMPILE = - optional stdenv.isLinux - ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"''; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNIXPKGS_LIBUDEV=\"${lib.getLib systemd}/lib/libudev\""; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix index 437ec6cef7..27008f6714 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix @@ -1,7 +1,5 @@ { qtModule, stdenv, lib, qtbase, qtdeclarative }: -with lib; - qtModule { pname = "qttools"; qtInputs = [ qtbase qtdeclarative ]; @@ -10,9 +8,9 @@ qtModule { # fixQtBuiltinPaths overwrites a builtin path we should keep postPatch = '' sed -i "src/linguist/linguist.pro" \ - -e '/^cmake_linguist_config_version_file.input =/ s|$$\[QT_HOST_DATA.*\]|${getDev qtbase}|' + -e '/^cmake_linguist_config_version_file.input =/ s|$$\[QT_HOST_DATA.*\]|${lib.getDev qtbase}|' sed -i "src/qtattributionsscanner/qtattributionsscanner.pro" \ - -e '/^cmake_qattributionsscanner_config_version_file.input =/ s|$$\[QT_HOST_DATA.*\]|${getDev qtbase}|' + -e '/^cmake_qattributionsscanner_config_version_file.input =/ s|$$\[QT_HOST_DATA.*\]|${lib.getDev qtbase}|' ''; devTools = [ @@ -34,12 +32,11 @@ qtModule { "bin/qthelpconverter" "bin/lprodump" "bin/qdistancefieldgenerator" - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "bin/macdeployqt" ]; - NIX_CFLAGS_COMPILE = - lib.optional stdenv.isDarwin ''-DNIXPKGS_QMLIMPORTSCANNER="${qtdeclarative.dev}/bin/qmlimportscanner"''; + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin ''-DNIXPKGS_QMLIMPORTSCANNER="${qtdeclarative.dev}/bin/qmlimportscanner"''; setupHook = ../hooks/qttools-setup-hook.sh; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 8d1eae7127..0324748774 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -15,21 +15,22 @@ , pipewire_0_2 , enableProprietaryCodecs ? true , gn -, cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin +, cctools, libobjc, libunwind, sandbox, xnu +, ApplicationServices, AVFoundation, Foundation, ForceFeedback, GameController, AppKit +, ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication +, cups, openbsm, runCommand, xcbuild, writeScriptBin , ffmpeg ? null , lib, stdenv, fetchpatch , version ? null , qtCompatVersion }: -with lib; - qtModule { pname = "qtwebengine"; qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ]; nativeBuildInputs = [ bison coreutils flex git gperf ninja pkg-config python2 which gn nodejs - ] ++ optional stdenv.isDarwin xcbuild; + ] ++ lib.optional stdenv.isDarwin xcbuild; doCheck = true; outputs = [ "bin" "dev" "out" ]; @@ -42,66 +43,65 @@ qtModule { # which cannot be set at the same time as -Wformat-security hardeningDisable = [ "format" ]; - postPatch = - '' - # Patch Chromium build tools - ( - cd src/3rdparty/chromium; + postPatch = '' + # Patch Chromium build tools + ( + cd src/3rdparty/chromium; - # Manually fix unsupported shebangs - substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ - --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" || true + # Manually fix unsupported shebangs + substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ + --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" || true - patchShebangs . - ) - '' - # Prevent Chromium build script from making the path to `clang` relative to - # the build directory. `clang_base_path` is the value of `QMAKE_CLANG_DIR` - # from `src/core/config/mac_osx.pri`. - + optionalString stdenv.isDarwin '' - substituteInPlace ./src/3rdparty/chromium/build/toolchain/mac/BUILD.gn \ - --replace 'prefix = rebase_path("$clang_base_path/bin/", root_build_dir)' 'prefix = "$clang_base_path/bin/"' - '' - # Patch library paths in Qt sources - + '' - sed -i \ - -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \ - -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \ - -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \ - src/core/web_engine_library_info.cpp - '' - # Patch library paths in Chromium sources - + optionalString (!stdenv.isDarwin) '' - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ - src/3rdparty/chromium/device/udev_linux/udev?_loader.cc + # TODO: be more precise + patchShebangs . + ) + '' + # Prevent Chromium build script from making the path to `clang` relative to + # the build directory. `clang_base_path` is the value of `QMAKE_CLANG_DIR` + # from `src/core/config/mac_osx.pri`. + + lib.optionalString stdenv.isDarwin '' + substituteInPlace ./src/3rdparty/chromium/build/toolchain/mac/BUILD.gn \ + --replace 'prefix = rebase_path("$clang_base_path/bin/", root_build_dir)' 'prefix = "$clang_base_path/bin/"' + '' + # Patch library paths in Qt sources + + '' + sed -i \ + -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \ + -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \ + -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \ + src/core/web_engine_library_info.cpp + '' + # Patch library paths in Chromium sources + + lib.optionalString (!stdenv.isDarwin) '' + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ + src/3rdparty/chromium/device/udev_linux/udev?_loader.cc - sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ - src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc - '' - + optionalString stdenv.isDarwin ( - (if (lib.versionAtLeast qtCompatVersion "5.14") then '' - substituteInPlace src/buildtools/config/mac_osx.pri \ - --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"' - '' else '' - substituteInPlace src/core/config/mac_osx.pri \ - --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"' - '') - # Following is required to prevent a build error: - # ninja: error: '/nix/store/z8z04p0ph48w22rqzx7ql67gy8cyvidi-SDKs/MacOSX10.12.sdk/usr/include/mach/exc.defs', needed by 'gen/third_party/crashpad/crashpad/util/mach/excUser.c', missing and no known rule to make it - + '' - substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ - --replace '$sysroot/usr' "${darwin.xnu}" - '' - # Apple has some secret stuff they don't share with OpenBSM - + (if (lib.versionAtLeast qtCompatVersion "5.14") then '' - substituteInPlace src/3rdparty/chromium/base/mac/mach_port_rendezvous.cc \ - --replace "audit_token_to_pid(request.trailer.msgh_audit)" "request.trailer.msgh_audit.val[5]" - substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/mach/mach_message.cc \ - --replace "audit_token_to_pid(audit_trailer->msgh_audit)" "audit_trailer->msgh_audit.val[5]" - '' else '' - substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ - --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" - '')); + sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ + src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc + '' + lib.optionalString stdenv.isDarwin ( + (if (lib.versionAtLeast qtCompatVersion "5.14") then '' + substituteInPlace src/buildtools/config/mac_osx.pri \ + --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"' + '' else '' + substituteInPlace src/core/config/mac_osx.pri \ + --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"' + '') + # Following is required to prevent a build error: + # ninja: error: '/nix/store/z8z04p0ph48w22rqzx7ql67gy8cyvidi-SDKs/MacOSX10.12.sdk/usr/include/mach/exc.defs', needed by 'gen/third_party/crashpad/crashpad/util/mach/excUser.c', missing and no known rule to make it + + '' + substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ + --replace '$sysroot/usr' "${xnu}" + '' + # Apple has some secret stuff they don't share with OpenBSM + + (if (lib.versionAtLeast qtCompatVersion "5.14") then '' + substituteInPlace src/3rdparty/chromium/base/mac/mach_port_rendezvous.cc \ + --replace "audit_token_to_pid(request.trailer.msgh_audit)" "request.trailer.msgh_audit.val[5]" + substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/mach/mach_message.cc \ + --replace "audit_token_to_pid(audit_trailer->msgh_audit)" "audit_trailer->msgh_audit.val[5]" + '' else '' + substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ + --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" + '')); NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit @@ -134,8 +134,8 @@ qtModule { ''; qmakeFlags = [ "--" "-system-ffmpeg" ] - ++ optional (stdenv.isLinux && (lib.versionAtLeast qtCompatVersion "5.15")) "-webengine-webrtc-pipewire" - ++ optional enableProprietaryCodecs "-proprietary-codecs"; + ++ lib.optional (stdenv.isLinux && (lib.versionAtLeast qtCompatVersion "5.15")) "-webengine-webrtc-pipewire" + ++ lib.optional enableProprietaryCodecs "-proprietary-codecs"; propagatedBuildInputs = [ # Image formats @@ -152,7 +152,7 @@ qtModule { libevent ffmpeg - ] ++ optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ dbus zlib minizip snappy nss protobuf jsoncpp # Audio formats @@ -168,14 +168,14 @@ qtModule { xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst xorg.libXcomposite xorg.libXdamage libdrm xorg.libxkbfile - ] ++ optionals (stdenv.isLinux && (lib.versionAtLeast qtCompatVersion "5.15")) [ + ] ++ lib.optionals (stdenv.isLinux && (lib.versionAtLeast qtCompatVersion "5.15")) [ # Pipewire pipewire_0_2 ] # FIXME These dependencies shouldn't be needed but can't find a way # around it. Chromium pulls this in while bootstrapping GN. - ++ lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ + ++ lib.optionals stdenv.isDarwin [ libobjc cctools @@ -196,11 +196,11 @@ qtModule { openbsm libunwind - ]); + ]; - buildInputs = optionals stdenv.isDarwin (with darwin; [ + buildInputs = lib.optionals stdenv.isDarwin [ cups - apple_sdk.libs.sandbox + sandbox # `sw_vers` is used by `src/3rdparty/chromium/build/config/mac/sdk_info.py` # to get some information about the host platform. @@ -216,11 +216,10 @@ qtModule { shift done '') - ]); + ]; dontUseNinjaBuild = true; dontUseNinjaInstall = true; - dontUseXcbuild = true; postInstall = lib.optionalString stdenv.isLinux '' cat > $out/libexec/qt.conf < 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.7.0) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.10.1) - addressable (~> 2.6) + cocoapods (1.11.0.beta.2) + addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.1) + cocoapods-core (= 1.11.0.beta.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,66 +32,68 @@ GEM escape (~> 0.0.4) fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.6) + molinillo (~> 0.8.0) nap (~> 1.0) - ruby-macho (~> 1.4) - xcodeproj (>= 1.19.0, < 2.0) - cocoapods-core (1.10.1) - activesupport (> 5.0, < 6) - addressable (~> 2.6) + ruby-macho (>= 1.0, < 3.0) + xcodeproj (>= 1.21.0, < 2.0) + cocoapods-core (1.11.0.beta.2) + activesupport (>= 5.0, < 7) + addressable (~> 2.8) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) netrc (~> 0.11) - public_suffix + public_suffix (~> 4.0) typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.4) + cocoapods-deintegrate (1.0.5) cocoapods-downloader (1.4.0) cocoapods-plugins (1.0.0) nap - cocoapods-search (1.0.0) + cocoapods-search (1.0.1) cocoapods-trunk (1.5.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) escape (0.0.4) - ethon (0.12.0) - ffi (>= 1.3.0) - ffi (1.15.0) + ethon (0.14.0) + ffi (>= 1.15.0) + ffi (1.15.3) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.8.9) + i18n (1.8.10) concurrent-ruby (~> 1.0) json (2.5.1) minitest (5.14.4) - molinillo (0.6.6) + molinillo (0.8.0) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) public_suffix (4.0.6) - ruby-macho (1.4.0) - thread_safe (0.3.6) + rexml (3.2.5) + ruby-macho (2.5.1) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.9) - thread_safe (~> 0.1) - xcodeproj (1.19.0) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + xcodeproj (1.21.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + zeitwerk (2.4.2) PLATFORMS - ruby + arm64-darwin-20 DEPENDENCIES cocoapods (>= 1.7.0.beta.1)! BUNDLED WITH - 2.1.4 + 2.2.20 diff --git a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock index cf718b02c0..c29ad34d4e 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -1,23 +1,26 @@ +GEM + specs: + GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.3) - activesupport (5.2.4.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) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.10.1) + cocoapods (1.10.2) addressable (~> 2.6) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.1) + cocoapods-core (= 1.10.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -32,7 +35,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.19.0, < 2.0) - cocoapods-core (1.10.1) + cocoapods-core (1.10.2) activesupport (> 5.0, < 6) addressable (~> 2.6) algoliasearch (~> 1.0) @@ -42,26 +45,26 @@ GEM netrc (~> 0.11) public_suffix typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.4) + cocoapods-deintegrate (1.0.5) cocoapods-downloader (1.4.0) cocoapods-plugins (1.0.0) nap - cocoapods-search (1.0.0) + cocoapods-search (1.0.1) cocoapods-trunk (1.5.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) escape (0.0.4) - ethon (0.12.0) - ffi (>= 1.3.0) - ffi (1.15.0) + ethon (0.14.0) + ffi (>= 1.15.0) + ffi (1.15.3) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.8.9) + i18n (1.8.10) concurrent-ruby (~> 1.0) json (2.5.1) minitest (5.14.4) @@ -70,24 +73,26 @@ GEM nap (1.1.0) netrc (0.11.0) public_suffix (4.0.6) + rexml (3.2.5) ruby-macho (1.4.0) thread_safe (0.3.6) typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (1.2.9) thread_safe (~> 0.1) - xcodeproj (1.19.0) + xcodeproj (1.21.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.3.0) + rexml (~> 3.2.4) PLATFORMS - ruby + arm64-darwin-20 DEPENDENCIES cocoapods! BUNDLED WITH - 2.1.4 + 2.2.20 diff --git a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix index 9c18d393bc..b64d6b189a 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc"; + sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk"; type = "gem"; }; - version = "5.2.4.5"; + version = "6.1.4"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k1fgp93nbgvp5m76wf067jcqy5zzbx0kczcxvhrzdxkkixzm30a"; + sha256 = "1rvmvxday0fg1p1ardmqc62xam212c6iaaf1djahvz70631grprq"; type = "gem"; }; - version = "1.10.1"; + version = "1.11.0.beta.2"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -79,20 +79,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x5lh6ws3rn2zxv7bagam54rkcslxrx6w1anwd35rjxsn4xx0d83"; + sha256 = "0cnnmbajllp3mw2w2b2bs2y42cnh1y1zbq63m3asg097z4d1a9h1"; type = "gem"; }; - version = "1.10.1"; + version = "1.11.0.beta.2"; }; cocoapods-deintegrate = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bf524f1za92i6rlr4cr6jm3c4vfjszsdc9lsr6wk5125c76ipzn"; + sha256 = "18pnng0lv5z6kpp8hnki0agdxx979iq6hxkfkglsyqzmir22lz2i"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; cocoapods-downloader = { groups = ["default"]; @@ -120,10 +120,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02wmy5rbjk29c65zn62bffxv30qs11slql23qx65snkm0vd93mn6"; + sha256 = "12amy0nknv09bvzix8bkmcjn996c50c4ms20v2dl7v8rcw73n4qv"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; cocoapods-trunk = { dependencies = ["nap" "netrc"]; @@ -161,10 +161,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; type = "gem"; }; - version = "1.1.8"; + version = "1.1.9"; }; escape = { groups = ["default"]; @@ -182,20 +182,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"; + sha256 = "1bby4hbq96vnzcdbbybcbddin8dxdnj1ns758kcr4akykningqhh"; type = "gem"; }; - version = "0.12.0"; + version = "0.14.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432"; + sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; type = "gem"; }; - version = "1.15.0"; + version = "1.15.3"; }; fourflusher = { groups = ["default"]; @@ -243,10 +243,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; type = "gem"; }; - version = "1.8.9"; + version = "1.8.10"; }; json = { groups = ["default"]; @@ -273,10 +273,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hh40z1adl4lw16dj4hxgabx4rr28mgqycih1y1d91bwww0jjdg6"; + sha256 = "0p846facmh1j5xmbrpgzadflspvk7bzs3sykrh5s7qi4cdqz5gzg"; type = "gem"; }; - version = "0.6.6"; + version = "0.8.0"; }; nanaimo = { groups = ["default"]; @@ -318,25 +318,25 @@ }; version = "4.0.6"; }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; ruby-macho = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lhdjn91jkifsy2hzq2hgcm0pp8pbik87m58zmw1ifh6hkp9adjb"; + sha256 = "1jgmhj4srl7cck1ipbjys6q4klcs473gq90bm59baw4j1wpfaxch"; type = "gem"; }; - version = "1.4.0"; - }; - thread_safe = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; - type = "gem"; - }; - version = "0.3.6"; + version = "2.5.1"; }; typhoeus = { dependencies = ["ethon"]; @@ -350,25 +350,35 @@ version = "1.4.0"; }; tzinfo = { - dependencies = ["thread_safe"]; + dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; type = "gem"; }; - version = "1.2.9"; + version = "2.0.4"; }; xcodeproj = { - dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; + dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn"; + sha256 = "0xmzb1mdsnkpf7v07whz0n2wc8kg6785sc7i5zyawd8dl8517rp4"; type = "gem"; }; - version = "1.19.0"; + version = "1.21.0"; + }; + zeitwerk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; + type = "gem"; + }; + version = "2.4.2"; }; } diff --git a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix index 90c1687aea..7a6b632002 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc"; + sha256 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj"; type = "gem"; }; - version = "5.2.4.5"; + version = "5.2.6"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k1fgp93nbgvp5m76wf067jcqy5zzbx0kczcxvhrzdxkkixzm30a"; + sha256 = "0d0vlzjizqkw2m6am9gcnjkxy73zl74ill28v17v0s2v8fzd7nbg"; type = "gem"; }; - version = "1.10.1"; + version = "1.10.2"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -77,20 +77,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x5lh6ws3rn2zxv7bagam54rkcslxrx6w1anwd35rjxsn4xx0d83"; + sha256 = "1j1sapw5l3xc5d8mli09az1bbmfdynlx7xv8lbghvm9i1md14dl5"; type = "gem"; }; - version = "1.10.1"; + version = "1.10.2"; }; cocoapods-deintegrate = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bf524f1za92i6rlr4cr6jm3c4vfjszsdc9lsr6wk5125c76ipzn"; + sha256 = "18pnng0lv5z6kpp8hnki0agdxx979iq6hxkfkglsyqzmir22lz2i"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; cocoapods-downloader = { groups = ["default"]; @@ -112,12 +112,14 @@ version = "1.0.0"; }; cocoapods-search = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02wmy5rbjk29c65zn62bffxv30qs11slql23qx65snkm0vd93mn6"; + sha256 = "12amy0nknv09bvzix8bkmcjn996c50c4ms20v2dl7v8rcw73n4qv"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; cocoapods-trunk = { dependencies = ["nap" "netrc"]; @@ -153,10 +155,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; type = "gem"; }; - version = "1.1.8"; + version = "1.1.9"; }; escape = { source = { @@ -172,20 +174,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"; + sha256 = "1bby4hbq96vnzcdbbybcbddin8dxdnj1ns758kcr4akykningqhh"; type = "gem"; }; - version = "0.12.0"; + version = "0.14.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432"; + sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; type = "gem"; }; - version = "1.15.0"; + version = "1.15.3"; }; fourflusher = { groups = ["default"]; @@ -229,10 +231,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; type = "gem"; }; - version = "1.8.9"; + version = "1.8.10"; }; json = { groups = ["default"]; @@ -298,6 +300,16 @@ }; version = "4.0.6"; }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; ruby-macho = { groups = ["default"]; platforms = []; @@ -339,14 +351,14 @@ version = "1.2.9"; }; xcodeproj = { - dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; + dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn"; + sha256 = "0xmzb1mdsnkpf7v07whz0n2wc8kg6785sc7i5zyawd8dl8517rp4"; type = "gem"; }; - version = "1.19.0"; + version = "1.21.0"; }; } diff --git a/third_party/nixpkgs/pkgs/development/node-packages/README.md b/third_party/nixpkgs/pkgs/development/node-packages/README.md index 9760285a91..38d1ff2018 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/README.md +++ b/third_party/nixpkgs/pkgs/development/node-packages/README.md @@ -1 +1 @@ -Moved to [/doc/languages-frameworks/node.section.md](/doc/languages-frameworks/node.section.md) +Moved to [/doc/languages-frameworks/javascript.section.md](/doc/languages-frameworks/javascript.section.md) diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index 2d97ed7c4e..7d1b6a9246 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -5,6 +5,7 @@ , "@bitwarden/cli" , "@hyperspace/cli" , "@nestjs/cli" +, "@squoosh/cli" , "@vue/cli" , "@webassemblyjs/cli" , "@webassemblyjs/repl" @@ -68,9 +69,11 @@ , "coc-wxml" , "coc-yaml" , "coc-yank" +, "code-theme-converter" , "coffee-script" , "coinmon" , "configurable-http-proxy" +, "conventional-changelog-cli" , "cordova" , "cpy-cli" , "create-cycle-app" @@ -133,7 +136,7 @@ , "indium" , "insect" , "ionic" -, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v7.2.4.tar.gz"} +, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v10.0.0.tar.gz"} , "jake" , "javascript-typescript-langserver" , "joplin" @@ -229,12 +232,13 @@ , "snyk" , "socket.io" , "speed-test" +, "sql-formatter" , "ssb-server" , "stackdriver-statsd-backend" , "stf" , "stylelint" -, "svelte-language-server" , "svelte-check" +, "svelte-language-server" , "svgo" , "swagger" , {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"} 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 7190f39426..0406e46594 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.1" = { + "@angular-devkit/architect-0.1202.2" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1202.1"; + version = "0.1202.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.1.tgz"; - sha512 = "sH2jzzfvXxVvlT7ZE175pHdZ4KW50hFfvF10U8Nry83dpfE54eeCntGfkT40geGwJXG+ibP/T9SG7PsbTssvKQ=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.2.tgz"; + sha512 = "ylceL10SlftuhE4/rNzDeLLTm+e3Wt1PmMvBd4e+Q2bk1E+Ws/scGKpwfnYPzFaACn5kjg5qZoJOkHSprIfNlQ=="; }; }; "@angular-devkit/core-12.0.5" = { @@ -76,13 +76,13 @@ let sha512 = "KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w=="; }; }; - "@angular-devkit/core-12.2.1" = { + "@angular-devkit/core-12.2.2" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "12.2.1"; + version = "12.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.1.tgz"; - sha512 = "To/2a5+PRroaCNEvqm5GluXhUwkThIBgF7I0HsmYkN32OauuLYPvwZYAKuPHMDNEFx9JKkG5RZonslXXycv1kw=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.2.tgz"; + sha512 = "iaPQc0M9FZWvE4MmxRFm5qFNBefvyN7H96pQIIPqT2yalSoiWv1HeQg/OS0WY61lvFPSHnR1n4DZsHCvLdZrFA=="; }; }; "@angular-devkit/schematics-12.0.5" = { @@ -103,13 +103,13 @@ let sha512 = "yD3y3pK/K5piOgvALFoCCiPp4H8emNa3yZL+vlpEpewVLpF1MM55LeTxc0PI5s0uqtOGVnvcbA5wYgMm3YsUEA=="; }; }; - "@angular-devkit/schematics-12.2.1" = { + "@angular-devkit/schematics-12.2.2" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "12.2.1"; + version = "12.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.1.tgz"; - sha512 = "lzW3HuoF0rCbYVqqnZp/68WWD09mjLd8N0WAhiod0vlFwMTq16L5D9zKCbC0unjjsIAJsIiT2ERHQICrOP1OKQ=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.2.tgz"; + sha512 = "KHPxZCSCbVFjaIlBMaxnoA96FnU62HDk8TpWRSnQY2dIkvEUU7+9UmWVodISaQ+MIYur35bFHPJ19im0YkR0tg=="; }; }; "@angular-devkit/schematics-cli-12.1.4" = { @@ -238,13 +238,13 @@ let sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; }; }; - "@apollo/client-3.4.7" = { + "@apollo/client-3.4.8" = { name = "_at_apollo_slash_client"; packageName = "@apollo/client"; - version = "3.4.7"; + version = "3.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/client/-/client-3.4.7.tgz"; - sha512 = "EmqGxXD8hr05cIFWJFwtGXifc+Lo8hTCEuiaQMtKknHszJfqIFXSxqP+H+eJnjfuoxH74aTSsZKtJlnE83Vt6w=="; + url = "https://registry.npmjs.org/@apollo/client/-/client-3.4.8.tgz"; + sha512 = "/cNqTSwc2Dw8q6FDDjdd30+yvhP7rI0Fvl3Hbro0lTtFuhzkevfNyQaI2jAiOrjU6Jc0RbanxULaNrX7UmvjSQ=="; }; }; "@apollo/protobufjs-1.2.2" = { @@ -1552,22 +1552,31 @@ let sha512 = "OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ=="; }; }; - "@blueprintjs/core-3.47.0" = { - name = "_at_blueprintjs_slash_core"; - packageName = "@blueprintjs/core"; - version = "3.47.0"; + "@blueprintjs/colors-1.0.0" = { + name = "_at_blueprintjs_slash_colors"; + packageName = "@blueprintjs/colors"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/core/-/core-3.47.0.tgz"; - sha512 = "u+bfmCyPXwKZMnwY4+e/iWjO2vDUvr8hA8ydmV0afyvcEe7Sh85UPEorIgQ/CBuRIbVMNm8FpLsFzDxgkfrCNA=="; + url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-1.0.0.tgz"; + sha512 = "eJh111ucz8HYxLBON6ADkAGQQBACqdbX6Zws/GpuiTkeCFJ3IAjZdBpk7IM7/Y5XuGuSS1ujwjnLDOEtyywtKw=="; }; }; - "@blueprintjs/icons-3.27.0" = { + "@blueprintjs/core-3.48.0" = { + name = "_at_blueprintjs_slash_core"; + packageName = "@blueprintjs/core"; + version = "3.48.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@blueprintjs/core/-/core-3.48.0.tgz"; + sha512 = "tuAL3dZrNaTq36RRy6O86wjmkiLt8LwHkleZ1zUcn/DC3cXsM3dSsRpV3f662bcEiAXMPeGemSC3tqv6uZCeLg=="; + }; + }; + "@blueprintjs/icons-3.28.0" = { name = "_at_blueprintjs_slash_icons"; packageName = "@blueprintjs/icons"; - version = "3.27.0"; + version = "3.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/icons/-/icons-3.27.0.tgz"; - sha512 = "ItRioyrr2s70chclj5q38HS9omKOa15b3JZXv9JcMIFz+6w6rAcoAH7DA+5xIs27bFjax/SdAZp/eYXSw0+QpA=="; + url = "https://registry.npmjs.org/@blueprintjs/icons/-/icons-3.28.0.tgz"; + sha512 = "gDvvU2ljV4NXsY5ofKcs1ChXAgmqNp/DIMu2uJIJmXhSXfP6JDd4qbnbGMsP3FmLTaqQP3E9oBZqAG/FRB8VmQ=="; }; }; "@braintree/sanitize-url-3.1.0" = { @@ -1768,13 +1777,13 @@ let sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; }; }; - "@deepcode/dcignore-1.0.2" = { + "@deepcode/dcignore-1.0.4" = { name = "_at_deepcode_slash_dcignore"; packageName = "@deepcode/dcignore"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@deepcode/dcignore/-/dcignore-1.0.2.tgz"; - sha512 = "DPgxtHuJwBORpqRkPXzzOT+uoPRVJmaN7LR+pmeL6DQM90kj6G6GFUH1i/YpRH8NbML8ZGEDwB9f9u4UwD2pzg=="; + url = "https://registry.npmjs.org/@deepcode/dcignore/-/dcignore-1.0.4.tgz"; + sha512 = "gsLh2FJ43Mz3kA6aqMq3BOUCMS5ub8pJZOpRgrZ1h0f/rkzphriUGLnC37+Jn86CFckxWlwHk/q28tyf0g4NBw=="; }; }; "@devicefarmer/adbkit-2.11.3" = { @@ -1975,13 +1984,13 @@ let sha512 = "ScPVUQ//zqqnpr53/WY8pVygs6KVTpXsPlAoo0ZeYfOjuTRh2uSMPN0+2UnUUD5FGjLm3hkpIibUH4ZMtLu8aw=="; }; }; - "@electron/get-1.12.4" = { + "@electron/get-1.13.0" = { name = "_at_electron_slash_get"; packageName = "@electron/get"; - version = "1.12.4"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/get/-/get-1.12.4.tgz"; - sha512 = "6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg=="; + url = "https://registry.npmjs.org/@electron/get/-/get-1.13.0.tgz"; + sha512 = "+SjZhRuRo+STTO1Fdhzqnv9D2ZhjxXP6egsJ9kiO8dtP68cDx7dFCwWi64dlMQV7sWcfW1OYCW4wviEBzmRsfQ=="; }; }; "@emmetio/abbreviation-2.2.2" = { @@ -2065,13 +2074,13 @@ let sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; }; - "@exodus/schemasafe-1.0.0-rc.3" = { + "@exodus/schemasafe-1.0.0-rc.4" = { name = "_at_exodus_slash_schemasafe"; packageName = "@exodus/schemasafe"; - version = "1.0.0-rc.3"; + version = "1.0.0-rc.4"; src = fetchurl { - url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.0.0-rc.3.tgz"; - sha512 = "GoXw0U2Qaa33m3eUcxuHnHpNvHjNlLo0gtV091XBpaRINaB4X6FGCG5XKxSFNFiPpugUDqNruHzaqpTdDm4AOg=="; + url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.0.0-rc.4.tgz"; + sha512 = "zHISeJ5jcHSo3i2bI5RHb0XEJ1JGxQ/QQzU2FLPcJxohNohJV8jHCM1FSrOUxTspyDRSSULg3iKQa1FJ4EsSiQ=="; }; }; "@expo/apple-utils-0.0.0-alpha.20" = { @@ -2092,22 +2101,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-5.0.7" = { + "@expo/config-5.0.8" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "5.0.7"; + version = "5.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-5.0.7.tgz"; - sha512 = "7Wzao9uALHmRSf59FMsHk1vxW4m4alDCJmfo+enXnl5o6UYiCDYfjNXctMwnW+fBM3opta4FbmmPGIftfXOesw=="; + url = "https://registry.npmjs.org/@expo/config/-/config-5.0.8.tgz"; + sha512 = "chxcjQh4H/suzvYi+p30VnGXSHbsiVsGFwEYIZbOw4ByjrCnzeD644KolbpeQ2/oWK3atci01Qcxc1TADSixHQ=="; }; }; - "@expo/config-plugins-3.0.7" = { + "@expo/config-plugins-3.0.8" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-3.0.7.tgz"; - sha512 = "7YOoFtxB6XqDil+OlGXi7iredKHxXVFCAOIVfFyEDzO3oo0gBmWGmUnHgrPDvpMj0q+adCCh5BL8OcvGfc9ITQ=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-3.0.8.tgz"; + sha512 = "reNYaYklOIq8QUY5ua1ubSRhVgY7hllvjingo22HHSaGhX4UvFFKDGYrjBdjcutHD6jw/eYLa8yJS74o1/rqkg=="; }; }; "@expo/config-types-42.0.0" = { @@ -2119,22 +2128,22 @@ let sha512 = "Rj02OMZke2MrGa/1Y/EScmR7VuWbDEHPJyvfFyyLbadUt+Yv6isCdeFzDt71I7gJlPR9T4fzixeYLrtXXOTq0w=="; }; }; - "@expo/dev-server-0.1.82" = { + "@expo/dev-server-0.1.83" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.82"; + version = "0.1.83"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.82.tgz"; - sha512 = "g7H4FDxcdt9y41MpivtpYqgNwEqoaSKA+lrR+qPCVPcZbIcq+xRq/coYfeXhp/L203vAab67cNVnqTQetj1T3A=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.83.tgz"; + sha512 = "4slFmSvQcjwNk3Mb7keNyAAdBIzWqeb8KUqSPYsqo10NGPtEbzmt0jlfqqi/df6cxUFJSgdSo/RJG9W5FT7lAA=="; }; }; - "@expo/dev-tools-0.13.113" = { + "@expo/dev-tools-0.13.114" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.113"; + version = "0.13.114"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.113.tgz"; - sha512 = "3z1gIBSnDATukcyvN1Q6ywT5FExJrf/wfg+1T0nQ8OZcyzFbi6u/tdns0mjT5Z+AyXDKtyHbQzGnRzegy82i3Q=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.114.tgz"; + sha512 = "iPatLxBcGoAzHVzFp7SpP1XbBMe+Qut2K2dU9PgZwcUVOeiESVi/48CXIOgS2PTkm/AJ1qOXprgkEROLlcrnjQ=="; }; }; "@expo/devcert-1.0.0" = { @@ -2164,13 +2173,13 @@ let sha512 = "CDnhjdirUs6OdN5hOSTJ2y3i9EiJMk7Z5iDljC5xyCHCrUex7oyI8vbRsZEojAahxZccgL/PrO+CjakiFFWurg=="; }; }; - "@expo/metro-config-0.1.82" = { + "@expo/metro-config-0.1.83" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.82"; + version = "0.1.83"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.82.tgz"; - sha512 = "rgx0ykWFvu+7jXDSe/cJB0fpIKqJX4X2k+azBIS9KmVLl5/ceKuCr6Abjy70HZTAXX/SQ7fS0C+FhzIX2Upgrg=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.83.tgz"; + sha512 = "nbmHRzAjnUmUoQjbVdTh8Xq1AXABmwqDi77otD+MxxfVmppMYLKYfMteZnrl75tmWkQY4JfVLD4DfKA3K+bKGA=="; }; }; "@expo/osascript-2.0.30" = { @@ -2182,13 +2191,13 @@ let sha512 = "IlBCyso1wJl8AbgS8n5lcUcXa/8TTU/rHgurWvJRWjErtFOELsqV4O+NCcB7jr4bvv8uZHeRKHQpsoyZWmmk/g=="; }; }; - "@expo/package-manager-0.0.46" = { + "@expo/package-manager-0.0.47" = { name = "_at_expo_slash_package-manager"; packageName = "@expo/package-manager"; - version = "0.0.46"; + version = "0.0.47"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.46.tgz"; - sha512 = "+Mo7UzRNUy52uzefRkeKv8+YEE+2NhBpXfvZ1Btha2/zSJ+8fxDT0mTQUiupiaeMRPyCMqdkoE39qjF26xifYA=="; + url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.47.tgz"; + sha512 = "guFnGAiNLW/JsienEq3NkZk5khTP+RdT/czk/teJUiYLkBy0hLmMTJsNXurGgFwI33+ScEbDvFmN5IOEBGpUDQ=="; }; }; "@expo/plist-0.0.13" = { @@ -2200,13 +2209,13 @@ let sha512 = "zGPSq9OrCn7lWvwLLHLpHUUq2E40KptUFXn53xyZXPViI0k9lbApcR9KlonQZ95C+ELsf0BQ3gRficwK92Ivcw=="; }; }; - "@expo/prebuild-config-2.0.7" = { + "@expo/prebuild-config-2.0.8" = { name = "_at_expo_slash_prebuild-config"; packageName = "@expo/prebuild-config"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-2.0.7.tgz"; - sha512 = "EMgo4ywR9hk+I90XEwtl/UHWOlw8GE01BQtrLWQbIR0pr+bvDOYINfe8PzA21oODPGUkbMvp5Z8E79VZBqqjfg=="; + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-2.0.8.tgz"; + sha512 = "mPL7rsZkybohTskB3SdepZx27LM94No3cmS4DLPFxWbtv4gJn7RL+e4eWmIkj2vOGuDnGRwiui7Hh7SFVvRsrg=="; }; }; "@expo/results-1.0.0" = { @@ -2218,6 +2227,15 @@ let sha512 = "qECzzXX5oJot3m2Gu9pfRDz50USdBieQVwYAzeAtQRUTD3PVeTK1tlRUoDcrK8PSruDLuVYdKkLebX4w/o55VA=="; }; }; + "@expo/rudder-sdk-node-1.0.7" = { + name = "_at_expo_slash_rudder-sdk-node"; + packageName = "@expo/rudder-sdk-node"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/rudder-sdk-node/-/rudder-sdk-node-1.0.7.tgz"; + sha512 = "TQuHUwugxzJGCYOFN/ZIQ+rNSdLPv2pgxaH2Ky7y80RDvWN8DNKeTbrgX0tPnVd/aLjKhxADx8C2se//lZR24w=="; + }; + }; "@expo/schemer-1.3.31" = { name = "_at_expo_slash_schemer"; packageName = "@expo/schemer"; @@ -2245,13 +2263,13 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.14.0" = { + "@expo/webpack-config-0.14.1" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.14.0.tgz"; - sha512 = "YsWLjOQIUN/+pJ5CEmhWfERwjpp6KGjxbd2Nm2KWx4v69wphyPudyrKJaD/b/41Iw5TKHGjV3hlHrYWvZ6OFaA=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.14.1.tgz"; + sha512 = "5FVcpwbTYmMoFwQ3WMyT/NP9sTuXYz7gYhtjZflPfNAWA8vVGuYlELce0P7bHkudQ/RWbpKOTG7uyRwDkjFIvA=="; }; }; "@expo/xcpretty-3.1.4" = { @@ -2317,22 +2335,22 @@ let sha512 = "+gsAnEjgoKB37o+tsMdSLtgqZ9z2PzpvnHx/2IqhRWjQQd7Xc7MbQsbZaQ5qfkioFHLnWGc/+WORpqKPy/sWrg=="; }; }; - "@fluentui/font-icons-mdl2-8.1.8" = { + "@fluentui/font-icons-mdl2-8.1.9" = { name = "_at_fluentui_slash_font-icons-mdl2"; packageName = "@fluentui/font-icons-mdl2"; - version = "8.1.8"; + version = "8.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.8.tgz"; - sha512 = "kZkCHM/mP8WWLLExz3x3wK5yQHPP4tAcvlHVqe69TbG8+3fxRGJSMOxzZO/04CFQp2A7/wOskSRtqeIBtaXJfw=="; + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.9.tgz"; + sha512 = "kRf14aaw/sAFl+eC6KWY0aaAI7zJAoYfWrikRZXi6yuMv/R8EJcuvYHUK1i3+LllX0wqVNJVGGwNlGXS8eMciw=="; }; }; - "@fluentui/foundation-legacy-8.1.8" = { + "@fluentui/foundation-legacy-8.1.9" = { name = "_at_fluentui_slash_foundation-legacy"; packageName = "@fluentui/foundation-legacy"; - version = "8.1.8"; + version = "8.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.1.8.tgz"; - sha512 = "m0zbRbZaJbzBjv8Ziv3zpwoGFjuzzPIAmhsn58g66MZvQBd9vN92hFJBNG2bO2+ivlprns4WnLEAiPK8CjoAsA=="; + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.1.9.tgz"; + sha512 = "jy6dqIBYIv+vTdQ0BJNqn9Je3SrmnrFAUHxxwn1QkFEYf9kIykqzF8Mt45osHER0SmWpSrqGOeGrkGKtki2vrA=="; }; }; "@fluentui/keyboard-key-0.2.17" = { @@ -2362,13 +2380,13 @@ let sha512 = "zCAEjZyALk0CGW1H9YNJU+e/MW0P5sFJfrDvac27K4S/dIQvKnOwMUNOWRkNz3yUEt0R9vo0NtiO3cW04cZq3A=="; }; }; - "@fluentui/react-7.174.0" = { + "@fluentui/react-7.174.1" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.174.0"; + version = "7.174.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.174.0.tgz"; - sha512 = "nPng19/ncq34ZwbHMa26US3Fu+7Q3GBo7DDcGnj5+csvw+XaGkJ+OeKDx0PyulkI5WM+hkR358VwxDJ87jlH1A=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.174.1.tgz"; + sha512 = "c6OF4iMImss6a+8NODme85Ekrvq6AV1jzW6BUGJ3Gc11pMuvxJsQwg5NCHzy8cXWsK7DbPP11JAM1cFNU2kG8w=="; }; }; "@fluentui/react-8.27.0" = { @@ -2389,22 +2407,22 @@ let sha512 = "JkLWNDe567lhvbnIhbYv9nUWYDIVN06utc3krs0UZBI+A0YZtQmftBtY0ghXo4PSjgozZocdu9sYkkgZOgyRLg=="; }; }; - "@fluentui/react-focus-8.1.10" = { + "@fluentui/react-focus-8.1.11" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "8.1.10"; + version = "8.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.1.10.tgz"; - sha512 = "sojXA6epu2QJbFf+XqP1AHOrrWssoQJWJNuzp0MCzQOWCUlLLqRpRUHtUKZzCnrbD9G5MOW8/192m/rSPyM7eA=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.1.11.tgz"; + sha512 = "tPWSqvWONm+guQFaeBpX9E9u6D9mJzIHscx7jsswh4SAtx0/KfcDEa0w/rYOZnriz4+kY7M8+wo0wwzkDI5I1Q=="; }; }; - "@fluentui/react-hooks-8.2.6" = { + "@fluentui/react-hooks-8.2.7" = { name = "_at_fluentui_slash_react-hooks"; packageName = "@fluentui/react-hooks"; - version = "8.2.6"; + version = "8.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.2.6.tgz"; - sha512 = "nz0iycSUmGX6eBKsmW23ocmKn/HdV7c8HnMHx5fcGIQbOqOH8Hv4wq8t3RozsZBapIi/nDjpZs2UvB4zDFsg1g=="; + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.2.7.tgz"; + sha512 = "eky46Uvy7jB27PmBBuFCvB9V9sXxrlZGcLuzDVhBWn1h3zOgtmu0txTrGYfMG/eOOlR9zf/EdDqc0F/jcQpslA=="; }; }; "@fluentui/react-window-provider-1.0.2" = { @@ -2434,13 +2452,13 @@ let sha512 = "2otMyJ+s+W+hjBD4BKjwYKKinJUDeIKYKz93qKrrJS0i3fKfftNroy9dHFlIblZ7n747L334plLi3bzQO1bnvA=="; }; }; - "@fluentui/style-utilities-8.2.2" = { + "@fluentui/style-utilities-8.3.0" = { name = "_at_fluentui_slash_style-utilities"; packageName = "@fluentui/style-utilities"; - version = "8.2.2"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.2.2.tgz"; - sha512 = "PKixlYfY93XOZRPNi+I8Qw9SkcBZsnG/qg2+3IxLGXpCVYKOmP52oR7N5j/nmspQZXdEoHehYa2z/lsKC2xw1w=="; + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.3.0.tgz"; + sha512 = "NGcT7XiEWR4LbtiPV9900N6DhQKRdG1cJm0efA1pUk640XxVFD0nnR/RmQFPtC3bkDRcVv7jK8E/0SSlRPkkbw=="; }; }; "@fluentui/theme-1.7.4" = { @@ -2452,22 +2470,22 @@ let sha512 = "o4eo7lstLxxXl1g2RR9yz18Yt8yjQO/LbQuZjsiAfv/4Bf0CRnb+3j1F7gxIdBWAchKj9gzaMpIFijfI98pvYQ=="; }; }; - "@fluentui/theme-2.2.1" = { + "@fluentui/theme-2.2.2" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.2.1.tgz"; - sha512 = "1G92TftVulrGXklL5upaN/WrrSzY/va39RM1eo0XO/Q3+kAhAajclQAXb7XanqOsVFcAqK1DbVvWayrY9DG2Qg=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.2.2.tgz"; + sha512 = "aR/Kn8B/ch/CYDwKWMv/fXrTaRXoQj86AhhmOOuq3GR3f4Qw53js7SaQMPJ6K/Ii6OS8chNmy+xelrPAqZStYA=="; }; }; - "@fluentui/utilities-8.2.2" = { + "@fluentui/utilities-8.3.0" = { name = "_at_fluentui_slash_utilities"; packageName = "@fluentui/utilities"; - version = "8.2.2"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.2.2.tgz"; - sha512 = "aM2/CgoTIssMDs7MoTla+q/VXN5Gkk4s12S8GZNp87cmEzDy008tKkiRpHj6PXZuvJL5bctZco9YQgusO0jZEg=="; + url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.3.0.tgz"; + sha512 = "fOvYjUtwDrj0SoZXphbXLclCyrgiJCxkBU4z15g/HaD8nwhndwc5msjllxMO0BWWeEh0CEEbUn61DqPGMot/wQ=="; }; }; "@google-cloud/paginator-3.0.5" = { @@ -2506,13 +2524,13 @@ let sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="; }; }; - "@google-cloud/pubsub-2.16.3" = { + "@google-cloud/pubsub-2.16.6" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.16.3"; + version = "2.16.6"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.3.tgz"; - sha512 = "KkH0IH1PUzgWBquUhWfSG//R/8K3agYRyrqqeNtLjbr2lnehrOVllPtdnroO4q2lxoul3WrK+esPvtVywkb4Ag=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.6.tgz"; + sha512 = "Hsa95pbgUmgxmrAQRePqGfpCx/zEqd+ueZDdi4jjvnew6bAP3r0+i+3a1/qkNonQYcWcf0a2tJnZwVDuMznvog=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -2605,22 +2623,22 @@ let sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow=="; }; }; - "@graphql-tools/merge-8.0.1" = { + "@graphql-tools/merge-8.0.2" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "8.0.1"; + version = "8.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.0.1.tgz"; - sha512 = "YAozogbjC2Oun+UcwG0LZFumhlCiHBmqe68OIf7bqtBdp4pbPAiVuK/J9oJqRVJmzvUqugo6RD9zz1qDTKZaiQ=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.0.2.tgz"; + sha512 = "li/bl6RpcZCPA0LrSxMYMcyYk+brer8QYY25jCKLS7gvhJkgzEFpCDaX43V1+X13djEoAbgay2mCr3dtfJQQRQ=="; }; }; - "@graphql-tools/mock-8.2.1" = { + "@graphql-tools/mock-8.2.2" = { name = "_at_graphql-tools_slash_mock"; packageName = "@graphql-tools/mock"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.2.1.tgz"; - sha512 = "/DyU742thZ3wSR8NxbzeV2K5sxtfPcnRJDuaN+WuHDOE1X1lsFiS49J0TouEnZCfLuAmhSjUMT/2GbD0xu6ggw=="; + url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.2.2.tgz"; + sha512 = "3cUJi14UHW1/8mebbXlAqfZl78IxeKzF2QlcJV5PSRQe27Dp/UnkHyid1UH/iwBdA98J7l0uw8NU1MRRVjhjIA=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -2632,13 +2650,13 @@ let sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA=="; }; }; - "@graphql-tools/schema-8.1.1" = { + "@graphql-tools/schema-8.1.2" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "8.1.1"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.1.1.tgz"; - sha512 = "u+0kxPtuP+GcKnGNt459Ob7iIpzesIJeJTmPPailaG7ZhB5hkXIizl4uHrzEIAh2Ja1P/VA8sEBYpu1N0n6Mmg=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.1.2.tgz"; + sha512 = "rX2pg42a0w7JLVYT+f/yeEKpnoZL5PpLq68TxC3iZ8slnNBNjfVfvzzOn8Q8Q6Xw3t17KP9QespmJEDfuQe4Rg=="; }; }; "@graphql-tools/url-loader-6.10.1" = { @@ -3118,15 +3136,6 @@ let sha512 = "Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg=="; }; }; - "@jest/types-24.9.0" = { - name = "_at_jest_slash_types"; - packageName = "@jest/types"; - version = "24.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz"; - sha512 = "XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw=="; - }; - }; "@jest/types-25.5.0" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; @@ -4009,13 +4018,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.202" = { + "@microsoft/load-themed-styles-1.10.203" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.202"; + version = "1.10.203"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.202.tgz"; - sha512 = "pWoN9hl1vfXnPfu2tS5VndXXKMe+UEWLJXDKNGXSNpmfszVLzG8Ns0TlZHlwtgpSaSD3f0kdVDfqAek8aflD4w=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.203.tgz"; + sha512 = "9UV+1kIAEdV1a8JI58iOpDc7mmFdgTW5qI4pAyL4Drk468ZCPmg/tHPbgAM/Pg8EtkWyIJm5E6KVofo+meavQQ=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -4090,31 +4099,31 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-18.2.9" = { + "@netlify/build-18.4.2" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "18.2.9"; + version = "18.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-18.2.9.tgz"; - sha512 = "0resO0G+O8SKcQ7UGUeYmrZCL1qeki+cWo47lOQduo4RNjHNH6fS2HSLM0CJEwTKw9SNiJNBb7hZbRi7C/KNdQ=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-18.4.2.tgz"; + sha512 = "q6eZ4D09agpeW6Y1DVyfXslRarAv/zR37vbFQC0kzZxdEkH6IjBKNT0eXDuG+OiL+BMi52M1MqlWI5lH8P/ELg=="; }; }; - "@netlify/cache-utils-2.0.1" = { + "@netlify/cache-utils-2.0.3" = { name = "_at_netlify_slash_cache-utils"; packageName = "@netlify/cache-utils"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-2.0.1.tgz"; - sha512 = "fAw8rMnl14f9TZmKV1g8+/8yVriitfNf4KcdfGPpGLpmQtpnSiynbzhpOLBHsLtViBCJ8O1vy24LK6CJx9JoqA=="; + url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-2.0.3.tgz"; + sha512 = "820dYhacTHXKxpYm81VlmCJ48ySGj+6GZi1oPLevdTSkMXGM1BphBKUjM/r9+GUE1ocGOh8Vdt3PsDp8f7gS4w=="; }; }; - "@netlify/config-15.3.3" = { + "@netlify/config-15.4.1" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "15.3.3"; + version = "15.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-15.3.3.tgz"; - sha512 = "etpctdQCHE/ALOYSWbyXzsquUSswWeUaqMIXfJsJ9pytMmB4oHjB6eu/GIT8FY1R0E6A/aVS2ibeVVexObNXbQ=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-15.4.1.tgz"; + sha512 = "YGyA3EO/aiH9PNmhnzBO9qDPu297Q31ej1PQ1ed3Ecr35jmXCwSDaDr65G+6JPSjhOMjh3cuqRmzU3chctutMQ=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -4126,13 +4135,13 @@ let sha512 = "tiKmDcHM2riSVN79c0mJY/67EBDafXQAMitHuLiCDAMdtz3kfv+NqdVG5krgf5lWR8Uf8AeZrUW5Q9RP25REvw=="; }; }; - "@netlify/framework-info-5.8.0" = { + "@netlify/framework-info-5.9.1" = { name = "_at_netlify_slash_framework-info"; packageName = "@netlify/framework-info"; - version = "5.8.0"; + version = "5.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.8.0.tgz"; - sha512 = "gc8K0BT6CSHnYFirLmUWLoKah+AjStWBsGmwa7gbRmeAaRThJhkRcRVE03EhSnrMQkAMO3IIIMklbE8i/9UpEg=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.9.1.tgz"; + sha512 = "EBbR4grr0innWmKk43q5iLokcuJ1bZn/56KBz8WyKsarCvLkt6SqHaxXJp3Uab1D6Fhn0BTQBhIttb3KdyPGdQ=="; }; }; "@netlify/functions-utils-2.0.2" = { @@ -4315,13 +4324,13 @@ let sha512 = "F1YcF2kje0Ttj+t5Cn5d6ojGQcKj4i/GMWgQuoZGVjQ31ToNcDXIbBm5SBKIkMMpNejtR1wF+1a0Q+aBPWiZVQ=="; }; }; - "@netlify/zip-it-and-ship-it-4.17.0" = { + "@netlify/zip-it-and-ship-it-4.19.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "4.17.0"; + version = "4.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.17.0.tgz"; - sha512 = "xcumwEFH7m/cw/XEcmv3OB8U94J5zWVsMhjROdfUdT+BE5QU5InEggYS6HnDoTOMgGpVM+mY1vgBQzdgaC+NZw=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.19.0.tgz"; + sha512 = "kEK7NkbBda0pyfW+HogEWviYPNw9sVt4B+Btd2PIKsKxehA7X9xSwJLIqnllVXv3FEIl5uMQWQwPzqTK+o2H4Q=="; }; }; "@node-red/editor-api-2.0.5" = { @@ -4414,13 +4423,13 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@npmcli/arborist-2.8.1" = { + "@npmcli/arborist-2.8.2" = { name = "_at_npmcli_slash_arborist"; packageName = "@npmcli/arborist"; - version = "2.8.1"; + version = "2.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.8.1.tgz"; - sha512 = "kbBWllN4CcdeN032Rw6b+TIsyoxWcv4YNN5gzkMCe8cCu0llwlq5P7uAD2oyL24QdmGlrlg/Yp0L1JF+HD8g9Q=="; + url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.8.2.tgz"; + sha512 = "6E1XJ0YXBaI9J+25gcTF110MGNx3jv6npr4Rz1U0UAqkuVV7bbDznVJvNqi6F0p8vgrE+Smf9jDTn1DR+7uBjQ=="; }; }; "@npmcli/ci-detect-1.3.0" = { @@ -4513,13 +4522,13 @@ let sha512 = "QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg=="; }; }; - "@npmcli/run-script-1.8.5" = { + "@npmcli/run-script-1.8.6" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; - version = "1.8.5"; + version = "1.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.5.tgz"; - sha512 = "NQspusBCpTjNwNRFMtz2C5MxoxyzlbuJ4YEhxAKrIonTiirKDtatsZictx9RgamQIx6+QuHMNmPl0wQdoESs9A=="; + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.6.tgz"; + sha512 = "e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g=="; }; }; "@oclif/color-0.1.2" = { @@ -4549,13 +4558,13 @@ let sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA=="; }; }; - "@oclif/core-0.5.30" = { + "@oclif/core-0.5.31" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "0.5.30"; + version = "0.5.31"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-0.5.30.tgz"; - sha512 = "J655ku+fptWPukM15F4DzGZnD1Q1UAzsS7jUy/nHIVhuwjwhl7u9QHLTjZ+1ud/99N2iXaYsa70UcnC1G3mfHQ=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-0.5.31.tgz"; + sha512 = "VPWOR8RORgVlmuulcx/aft1nBhTjT7YiwCeZB/bAiNgqCQ4YncoeIIPJPJs/A0a0dIeOYACfxlp1Xw7vznpISg=="; }; }; "@oclif/errors-1.3.5" = { @@ -5386,13 +5395,13 @@ let sha512 = "tU8fQs0D76ZKhJ2cWtnfQthWqiZgGBx0gH0+5D8JvaBEBaqA8foPPBt3Nonwr3ygyv5xrw2IzKWgIY86BlGs+w=="; }; }; - "@redocly/openapi-core-1.0.0-beta.54" = { + "@redocly/openapi-core-1.0.0-beta.55" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.54"; + version = "1.0.0-beta.55"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.54.tgz"; - sha512 = "uYs0N1Trjkh7u8IMIuCU2VxCXhMyGWSZUkP/WNdTR1OgBUtvNdF9C32zoQV+hyCIH4gVu42ROHkjisy333ZX+w=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.55.tgz"; + sha512 = "n/uukofKgqLdF1RyaqIOz+QneonKudV77M8j8SnGxP+bg7ujn+lmjcLy96ECtLvom0+BTbbzSMQpJeEix6MGuQ=="; }; }; "@redocly/react-dropdown-aria-2.0.12" = { @@ -5485,13 +5494,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-12.2.1" = { + "@schematics/angular-12.2.2" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "12.2.1"; + version = "12.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.1.tgz"; - sha512 = "v6+LWx688PBmp+XWLtwu+UL1AAZsd0RsBrLmruSul70vFQ0xBB3MIuYlF5NHUukaBP/GMn426UkiTUgYUUM8ww=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.2.tgz"; + sha512 = "Nqw9rHOTUIzhCxAgj/J1S9C7YLhrsbLbEKJ8gVy6Aakj4jdJBJ9oqPCLnVpP+48k8hSyIZ6TA5X9eVmrUhDDWQ=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -5521,13 +5530,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.15.0" = { + "@serverless/components-3.15.1" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.15.0"; + version = "3.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.15.0.tgz"; - sha512 = "oi5a1QjyAoH4CiSCNB+kIyvXMcs3tfLMGXM+pk7Ns1ra5ZWoD3PImRQKRUu/2BTSYqB6iUM3+HmMQGT1yORgBg=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.15.1.tgz"; + sha512 = "NTwRE6mc6GUOiN586/ikTxXYF0S7Hd8hc01LGEPYCeOelUxNHCBt7vjuSLxIkSM06RTkjEYGrZgkrkqX5KkirQ=="; }; }; "@serverless/core-1.1.2" = { @@ -5602,13 +5611,13 @@ let sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog=="; }; }; - "@serverless/utils-5.6.0" = { + "@serverless/utils-5.7.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "5.6.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.6.0.tgz"; - sha512 = "R3mb6DlPwrlo49fwQNz3YTQb2XJCxVui+s/olVBSdAh82fi8EbbjgkZkaLKB9ES7lV2MIr3jqrIWjYyGE/2Bgw=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.7.0.tgz"; + sha512 = "4/9lTag4NNMtgoK7qRSoP//VplnKUTqgKMJ5pjvuXHFTBNoGYbdi5Cr1UmbHwnG8FfYBUy95jNUHjSEeUXDqgg=="; }; }; "@serverless/utils-china-1.1.4" = { @@ -5773,13 +5782,13 @@ let sha512 = "T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw=="; }; }; - "@snyk/cloud-config-parser-1.10.1" = { + "@snyk/cloud-config-parser-1.10.2" = { name = "_at_snyk_slash_cloud-config-parser"; packageName = "@snyk/cloud-config-parser"; - version = "1.10.1"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cloud-config-parser/-/cloud-config-parser-1.10.1.tgz"; - sha512 = "boqO3H4zkGo+Q2C7qyG2l/sQX80ZRSOlPCiRtgN9Xa7u9fM+qFGOaFOgNWfZZtU0wLBy2yDs5ipzdfqvp0ZEjg=="; + url = "https://registry.npmjs.org/@snyk/cloud-config-parser/-/cloud-config-parser-1.10.2.tgz"; + sha512 = "ovA6iX59jLOVMfZr6rsqYNcOIjZTYAbm34bn41m3hRbCPuZkxe3JNKxjsEFCFkZQBnGSebrbz8TGoe81y0L2Cw=="; }; }; "@snyk/cocoapods-lockfile-parser-3.6.2" = { @@ -5953,6 +5962,15 @@ let sha512 = "kLfFGckSmyKe667UGPyWzR/H7/Trkt4fD8O/ktElOx1zWgmivpLm0Symb4RCfEmz9irWv+N6zIKRrfSNdytcPQ=="; }; }; + "@squoosh/lib-0.4.0" = { + name = "_at_squoosh_slash_lib"; + packageName = "@squoosh/lib"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@squoosh/lib/-/lib-0.4.0.tgz"; + sha512 = "O1LyugWLZjMI4JZeZMA5vzfhfPjfMZXH5/HmVkRagP8B70wH3uoR7tjxfGNdSavey357MwL8YJDxbGwBBdHp7Q=="; + }; + }; "@starptech/expression-parser-0.10.0" = { name = "_at_starptech_slash_expression-parser"; packageName = "@starptech/expression-parser"; @@ -6322,13 +6340,13 @@ let sha512 = "XP20kvfyMNlWdPVQXyuzA40LoCHbbJptikt7W+TlZ5sS+NNjk70xjXCtHBLEudp7li3JldXEFSIUzpW1a0WEhA=="; }; }; - "@turist/time-0.0.1" = { + "@turist/time-0.0.2" = { name = "_at_turist_slash_time"; packageName = "@turist/time"; - version = "0.0.1"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@turist/time/-/time-0.0.1.tgz"; - sha512 = "M2BiThcbxMxSKX8W4z5u9jKZn6datnM3+FpEU+eYw0//l31E2xhqi7vTAuJ/Sf0P3yhp66SDJgPu3bRRpvrdQQ=="; + url = "https://registry.npmjs.org/@turist/time/-/time-0.0.2.tgz"; + sha512 = "qLOvfmlG2vCVw5fo/oz8WAZYlpe5a5OurgTj3diIxJCdjRHpapC+vQCz3er9LV79Vcat+DifBjeAhOAdmndtDQ=="; }; }; "@types/accepts-1.3.5" = { @@ -7114,13 +7132,13 @@ let sha512 = "559S2XW9YMwHznROJ4WFhZJOerJPuxLfqOX+LIKukyLo2NbVgpULwXUsrBlCwhZ4+ACHgVAE23CC3RS52lFxwA=="; }; }; - "@types/mdast-3.0.7" = { + "@types/mdast-3.0.8" = { name = "_at_types_slash_mdast"; packageName = "@types/mdast"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.7.tgz"; - sha512 = "YwR7OK8aPmaBvMMUi+pZXBNoW2unbVbfok4YRqGMJBe1dpDlzpRkJrYEYmvjxgs5JhuQmKfDexrN98u941Zasg=="; + url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.8.tgz"; + sha512 = "HdUXWDNtDenuVJFrV2xBCLEMiw1Vn7FMuJxqJC5oBvC2adA3pgtp6CPCIMQdz3pmWxGuJjT+hOp6FnOXy6dXoQ=="; }; }; "@types/mime-1.3.2" = { @@ -7132,13 +7150,13 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/mime-types-2.1.0" = { + "@types/mime-types-2.1.1" = { name = "_at_types_slash_mime-types"; packageName = "@types/mime-types"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz"; - sha1 = "9ca52cda363f699c69466c2a6ccdaad913ea7a73"; + url = "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.1.tgz"; + sha512 = "vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw=="; }; }; "@types/minimatch-3.0.5" = { @@ -7267,13 +7285,13 @@ let sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.17.9" = { + "@types/node-14.17.10" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.17.9"; + version = "14.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.17.9.tgz"; - sha512 = "CMjgRNsks27IDwI785YMY0KLt3co/c0cQ5foxHYv/shC2w8oOnVwz5Ubq1QG5KzrcW+AXk6gzdnxIkDnTvzu3g=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.17.10.tgz"; + sha512 = "09x2d6kNBwjHgyh3jOUE2GE4DFoxDriDvWdu6mFhMP1ysynGYazt4ecZmJlL6/fe4Zi2vtYvTvtL7epjQQrBhA=="; }; }; "@types/node-15.12.5" = { @@ -7285,13 +7303,13 @@ let sha512 = "se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg=="; }; }; - "@types/node-15.14.7" = { + "@types/node-15.14.8" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "15.14.7"; + version = "15.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-15.14.7.tgz"; - sha512 = "FA45p37/mLhpebgbPWWCKfOisTjxGK9lwcHlJ6XVLfu3NgfcazOJHdYUZCWPMK8QX4LhNZdmfo6iMz9FqpUbaw=="; + url = "https://registry.npmjs.org/@types/node/-/node-15.14.8.tgz"; + sha512 = "+ZjmmoGV7WBwhzNh/GkwehB7uyXn9HFwzQUfj9pbyR8eFAq20Qguoh93sPbWzzhsbhTme6YE92/iJ54Z0WRH7A=="; }; }; "@types/node-15.6.1" = { @@ -7330,6 +7348,24 @@ let sha512 = "Sr7BhXEAer9xyGuCN3Ek9eg9xPviCF2gfu9kTfuU2HkTVAMYSDeX40fvpmo72n5nansg3nsBjuQBrsS28r+NUw=="; }; }; + "@types/node-16.6.2" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "16.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-16.6.2.tgz"; + sha512 = "LSw8TZt12ZudbpHc6EkIyDM3nHVWKYrAvGy6EAJfNfjusbwnThqjqxUKKRwuV3iWYeW/LYMzNgaq3MaLffQ2xA=="; + }; + }; + "@types/node-16.7.0" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "16.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-16.7.0.tgz"; + sha512 = "e66BrnjWQ3BRBZ2+iA5e85fcH9GLNe4S0n1H0T3OalK2sXg5XWEFTO4xvmGrYQ3edy+q6fdOh5t0/HOY8OAqBg=="; + }; + }; "@types/node-6.14.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -7465,22 +7501,22 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/rc-1.1.0" = { + "@types/rc-1.2.0" = { name = "_at_types_slash_rc"; packageName = "@types/rc"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/rc/-/rc-1.1.0.tgz"; - sha512 = "qw1q31xPnaeExbOA1daA3nfeKW2uZQN4Xg8QqZDM3vsXPHK/lyDpjWXJQIcrByRDcBzZJ3ccchSMMTDtCWgFpA=="; + url = "https://registry.npmjs.org/@types/rc/-/rc-1.2.0.tgz"; + sha512 = "eEQ6Hq0K0VShe00iDzG1DKxA5liTsk7jgcR5eDZ5d5cnivLjPqqcDgqurS5NlQJNfgTNg51dp7zFGWHomr5NJQ=="; }; }; - "@types/react-16.14.13" = { + "@types/react-16.14.14" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "16.14.13"; + version = "16.14.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-16.14.13.tgz"; - sha512 = "KznsRYfqPmbcA5pMxc4mYQ7UgsJa2tAgKE2YwEmY5xKaTVZXLAY/ImBohyQHnEoIjxIJR+Um4FmaEYDr3q3zlg=="; + url = "https://registry.npmjs.org/@types/react/-/react-16.14.14.tgz"; + sha512 = "uwIWDYW8LznHzEMJl7ag9St1RsK0gw/xaFZ5+uI1ZM1HndwUgmPH3/wQkSb87GkOVg7shUxnpNW8DcN0AzvG5Q=="; }; }; "@types/react-dom-16.9.14" = { @@ -7753,6 +7789,15 @@ let sha512 = "KtQLad12+4T/NfSxpoDhmr22+fig3T7/08QCgmutYA6QSznSRmEtuL95GrhVV40/0otTEdFc+etRcCTqhh1q5Q=="; }; }; + "@types/uuid-3.4.10" = { + name = "_at_types_slash_uuid"; + packageName = "@types/uuid"; + version = "3.4.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.10.tgz"; + sha512 = "BgeaZuElf7DEYZhWYDTc/XcLZXdVgFkVSTa13BqKvbnmUrxr3TJFKofUxCtDO9UQOdhnV+HPOESdHiHKZOJV1A=="; + }; + }; "@types/uuid-8.3.1" = { name = "_at_types_slash_uuid"; packageName = "@types/uuid"; @@ -7825,6 +7870,15 @@ let sha512 = "B5m9aq7cbbD/5/jThEr33nUY8WEfVi6A2YKCTOvw5Ldy7mtsOkqRvGjnzy6g7iMMDsgu7xREuCzqATLDLQVKcQ=="; }; }; + "@types/ws-6.0.4" = { + name = "_at_types_slash_ws"; + packageName = "@types/ws"; + version = "6.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz"; + sha512 = "PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg=="; + }; + }; "@types/ws-7.4.4" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; @@ -7852,15 +7906,6 @@ let sha512 = "JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww=="; }; }; - "@types/yargs-13.0.12" = { - name = "_at_types_slash_yargs"; - packageName = "@types/yargs"; - version = "13.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.12.tgz"; - sha512 = "qCxJE1qgz2y0hA4pIxjBR+PelCH0U5CK1XJXFwCNqfmliatKp47UCXXE9Dyk1OXBDLvsCF57TqQEJaeLfDYEOQ=="; - }; - }; "@types/yargs-15.0.14" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; @@ -8203,31 +8248,31 @@ let sha512 = "B6PedV/H2kcGEAgnqncwjHe3E8fqUNXCLv1BsrNwkHHWQJXkDN7dFeuEB4oaucBOVbjhH7KGLJ6JAiXPE3S7xA=="; }; }; - "@vue/compiler-core-3.2.2" = { + "@vue/compiler-core-3.2.4" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.2.2"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.2.tgz"; - sha512 = "QhCI0ZU5nAR0LMcLgzW3v75374tIrHGp8XG5CzJS7Nsy+iuignbE4MZ2XJfh5TGIrtpuzfWA4eTIfukZf/cRdg=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.4.tgz"; + sha512 = "c8NuQq7mUXXxA4iqD5VUKpyVeklK53+DMbojYMyZ0VPPrb0BUWrZWFiqSDT+MFDv0f6Hv3QuLiHWb1BWMXBbrw=="; }; }; - "@vue/compiler-dom-3.2.2" = { + "@vue/compiler-dom-3.2.4" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.2.2"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.2.tgz"; - sha512 = "ggcc+NV/ENIE0Uc3TxVE/sKrhYVpLepMAAmEiQ047332mbKOvUkowz4TTFZ+YkgOIuBOPP0XpCxmCMg7p874mA=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.4.tgz"; + sha512 = "uj1nwO4794fw2YsYas5QT+FU/YGrXbS0Qk+1c7Kp1kV7idhZIghWLTjyvYibpGoseFbYLPd+sW2/noJG5H04EQ=="; }; }; - "@vue/shared-3.2.2" = { + "@vue/shared-3.2.4" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.2.2"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.2.tgz"; - sha512 = "dvYb318tk9uOzHtSaT3WII/HscQSIRzoCZ5GyxEb3JlkEXASpAUAQwKnvSe2CudnF8XHFRTB7VITWSnWNLZUtA=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.4.tgz"; + sha512 = "j2j1MRmjalVKr3YBTxl/BClSIc8UQ8NnPpLYclxerK65JIowI4O7n8O8lElveEtEoHxy1d7BelPUDI0Q4bumqg=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -8788,6 +8833,24 @@ let sha512 = "WwB53ikYudh9pIorgxrkHKrQZcCqNM/Q/bDzZBffEaGUKGuHrRb3zZUT9Sh2qw9yogC7SsdRmQ1ER0pqvd3bfw=="; }; }; + "@xmldom/xmldom-0.7.2" = { + name = "_at_xmldom_slash_xmldom"; + packageName = "@xmldom/xmldom"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.2.tgz"; + sha512 = "t/Zqo0ewes3iq6zGqEqJNUWI27Acr3jkmSUNp6E3nl0Z2XbtqAG5XYqPNLdYonILmhcxANsIidh69tHzjXtuRg=="; + }; + }; + "@xstate/fsm-1.6.1" = { + name = "_at_xstate_slash_fsm"; + packageName = "@xstate/fsm"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xstate/fsm/-/fsm-1.6.1.tgz"; + sha512 = "xYKDNuPR36/fUK+jmhM+oauBmbdUAfuJKnDjg3/7NbN+Pj03TX7e94LXnzkwGgAR+U/HWoMqM5UPTuGIYfIx9g=="; + }; + }; "@xtuc/ieee754-1.2.0" = { name = "_at_xtuc_slash_ieee754"; packageName = "@xtuc/ieee754"; @@ -9895,6 +9958,15 @@ let sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; }; }; + "ansi-regex-6.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.0.tgz"; + sha512 = "tAaOSrWCHF+1Ear1Z4wnJCXA9GGox4K6Ic85a5qalES2aeEwQGr7UC93mwef49536PkCYjzkp0zIxfFvexJ6zQ=="; + }; + }; "ansi-split-1.0.1" = { name = "ansi-split"; packageName = "ansi-split"; @@ -11407,13 +11479,13 @@ let sha512 = "vRfQwcqBnJTLzVQo72Sf7KIUbcSUP5hNchx6udI1U6LuPQpfePgdjJzlCe76yFZ8pxlLjn9lwcl/Ya0TSOv0Tw=="; }; }; - "async-retry-1.3.1" = { + "async-retry-1.3.3" = { name = "async-retry"; packageName = "async-retry"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/async-retry/-/async-retry-1.3.1.tgz"; - sha512 = "aiieFW/7h3hY0Bq5d+ktDBejxuwR78vRu9hDUdR8rNhSaQ29VzPL4AoIRG7D/c7tdenwOcKvgPM6tIxB3cB6HA=="; + url = "https://registry.npmjs.org/async-retry/-/async-retry-1.3.3.tgz"; + sha512 = "wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw=="; }; }; "async-retry-ng-2.0.1" = { @@ -11578,6 +11650,15 @@ let sha512 = "Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ=="; }; }; + "auto-changelog-1.16.4" = { + name = "auto-changelog"; + packageName = "auto-changelog"; + version = "1.16.4"; + src = fetchurl { + url = "https://registry.npmjs.org/auto-changelog/-/auto-changelog-1.16.4.tgz"; + sha512 = "h7diyELoq692AA4oqO50ULoYKIomUdzuQ+NW+eFPwIX0xzVbXEu9cIcgzZ3TYNVbpkGtcNKh51aRfAQNef7HVA=="; + }; + }; "autocast-0.0.4" = { name = "autocast"; packageName = "autocast"; @@ -11650,13 +11731,22 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.968.0" = { + "aws-sdk-2.972.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.968.0"; + version = "2.972.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.968.0.tgz"; - sha512 = "6kXJ/4asP+zI8oFJAUqEmVoaLOnAYriorigKy8ZjFe3ISl4w0PEOXBG1TtQFuLiNPR3BAvhRuOQ5yH6JfqDNNw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.972.0.tgz"; + sha512 = "oRRjz68Yej/wz5JLc41zeG1m7QCvSj+Y2IOFqDflgwpDy4/M7Lp5HmCK2IK0d62FsKvG63b/9JL6+60ybGcsow=="; + }; + }; + "aws-sdk-2.973.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.973.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.973.0.tgz"; + sha512 = "IhVDIrI+7x+643S7HKDZ8bA8rTKfkCLSlxUZcP9W39PD5y04Hwamxou/kNTtXzdg1yyriq3d5tCVu6w5Z5QFDQ=="; }; }; "aws-sign2-0.6.0" = { @@ -13180,13 +13270,13 @@ let sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; }; }; - "bittorrent-tracker-9.17.4" = { + "bittorrent-tracker-9.18.0" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; - version = "9.17.4"; + version = "9.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.17.4.tgz"; - sha512 = "ykhdVQHtLfn4DYSJUQD/zFAbP8YwnF6nGlj2SBnCY4xkW5bhwXPeFZUhryAtdITl0qNL/FpmFOamBZfxIwkbxg=="; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.18.0.tgz"; + sha512 = "bZhW94TOExkRhn9g67SLWjGfT6seSlT//+oG7+AFve0wQP6DMNSnu7ued6McsTMaL+XivNFCE9YVWPbQ4moTYA=="; }; }; "bl-1.2.3" = { @@ -13576,13 +13666,13 @@ let sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; }; }; - "boolean-3.1.2" = { + "boolean-3.1.4" = { name = "boolean"; packageName = "boolean"; - version = "3.1.2"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/boolean/-/boolean-3.1.2.tgz"; - sha512 = "YN6UmV0FfLlBVvRvNPx3pz5W/mUoYB24J4WSXOKP/OOJpi+Oq6WYqPaNTHzjI0QzwWtnvEd5CGYyQPgp1jFxnw=="; + url = "https://registry.npmjs.org/boolean/-/boolean-3.1.4.tgz"; + sha512 = "3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w=="; }; }; "boom-2.10.1" = { @@ -13765,6 +13855,15 @@ let sha512 = "z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw=="; }; }; + "bplist-parser-0.3.0" = { + name = "bplist-parser"; + packageName = "bplist-parser"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.0.tgz"; + sha512 = "zgmaRvT6AN1JpPPV+S0a1/FAtoxSreYDccZGIqEMSvZl9DMe70mJ7MFzpxa1X+gHVdkToE2haRUHHMiW1OdejA=="; + }; + }; "brace-expansion-1.1.11" = { name = "brace-expansion"; packageName = "brace-expansion"; @@ -14035,13 +14134,13 @@ let sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; - "browserslist-4.16.7" = { + "browserslist-4.16.8" = { name = "browserslist"; packageName = "browserslist"; - version = "4.16.7"; + version = "4.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz"; - sha512 = "7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.8.tgz"; + sha512 = "sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ=="; }; }; "brq-0.1.8" = { @@ -14540,6 +14639,15 @@ let sha512 = "GtKwd/4etuk1hNeprXoESBO1RSeRYJMXKf+O0qHmWdUomLT8ysNEfX/4bZFXr3BK6eukpHiEnhY2uMtEHDM2ng=="; }; }; + "bull-3.29.0" = { + name = "bull"; + packageName = "bull"; + version = "3.29.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bull/-/bull-3.29.0.tgz"; + sha512 = "ad9BvfPczwzkQ9wpM6jtAUNthyAGdHoJZVpY3dTp8jPYHETH9l4LdxJYjrKNBHjT4YUeqLzj/2r1L2MYre2ETg=="; + }; + }; "bunyan-1.5.1" = { name = "bunyan"; packageName = "bunyan"; @@ -15215,22 +15323,22 @@ let sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg=="; }; }; - "cdk8s-1.0.0-beta.27" = { + "cdk8s-1.0.0-beta.30" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.0.0-beta.27"; + version = "1.0.0-beta.30"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.27.tgz"; - sha512 = "6WGhwIQ0zRrJfGDIxfpqwCsj6Varuds90xp3dEwym68ZLfROn/sq8Kdwr8QlMWf50qbcja+TLdqKgAt185a/ig=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.30.tgz"; + sha512 = "U7esrJ2aQ89ACJY8TD0UWgP0dC30V+vy5ZZ8zSiHJyM5JL4N61pLWXDlrKAhpI3rFlrZn6h8YefkQJRM5aC2gw=="; }; }; - "cdk8s-plus-17-1.0.0-beta.42" = { + "cdk8s-plus-17-1.0.0-beta.52" = { name = "cdk8s-plus-17"; packageName = "cdk8s-plus-17"; - version = "1.0.0-beta.42"; + version = "1.0.0-beta.52"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-17/-/cdk8s-plus-17-1.0.0-beta.42.tgz"; - sha512 = "GIe4xGLtd9zF7OPag8g4NVb7bsw/x/UcVH2w1WSTuXPe3ZFPNJ+zUAeEhuOL4BB90Czg0QIMDvIo7Vw00y3MmQ=="; + url = "https://registry.npmjs.org/cdk8s-plus-17/-/cdk8s-plus-17-1.0.0-beta.52.tgz"; + sha512 = "SGYJinLrJMk5DFVg3a0KsW0cahUGeyJvN5fRFfx7ZmdDjdcOPBRwCj08fGP2ont7xvNkFEgHopNfImOkFbd7fw=="; }; }; "cdktf-0.5.0" = { @@ -15503,13 +15611,13 @@ let sha512 = "+2jlOobSk52c1VU6fzkh3UwqHMdSlgH1xFv9FKMqHiNCpXsGPQa/+81AFa+i3jZ253Mq9aAycPwDjnn1XbRNNw=="; }; }; - "chart.js-3.5.0" = { + "chart.js-3.5.1" = { name = "chart.js"; packageName = "chart.js"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/chart.js/-/chart.js-3.5.0.tgz"; - sha512 = "J1a4EAb1Gi/KbhwDRmoovHTRuqT8qdF0kZ4XgwxpGethJHUdDrkqyPYwke0a+BuvSeUxPf8Cos6AX2AB8H8GLA=="; + url = "https://registry.npmjs.org/chart.js/-/chart.js-3.5.1.tgz"; + sha512 = "m5kzt72I1WQ9LILwQC4syla/LD/N413RYv2Dx2nnTkRS9iv/ey1xLTt0DnPc/eWV4zI+BgEgDYBIzbQhZHc/PQ=="; }; }; "chartjs-color-2.4.1" = { @@ -15971,13 +16079,13 @@ let sha512 = "OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="; }; }; - "cldr-6.1.1" = { + "cldr-7.1.1" = { name = "cldr"; packageName = "cldr"; - version = "6.1.1"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cldr/-/cldr-6.1.1.tgz"; - sha512 = "Efm9g4BcBHWdy7jMcuXtWk7PI1gIx4nO1BhJyaFTeRktytW0tR4rDmm+PG7mSMLrnNUFcr3ww8JwJAgkNRMv5Q=="; + url = "https://registry.npmjs.org/cldr/-/cldr-7.1.1.tgz"; + sha512 = "zHHQLSZT9i/g7wAxGrMj1BRD7JYOSJHvPIT06EFkFEl4m9ItW48i9yWqgRgWESJ5oUqLs9IuMDoKf+21Lscqrg=="; }; }; "clean-css-3.4.28" = { @@ -16565,6 +16673,24 @@ let sha512 = "ZZjKqOeNgXtz40seJmSYbfAsIGJVzDIAn30w0QRmnyXHFrjEXhW/K8ZgRw5FtsezYFQEuZXSp93S0UkKJHuhKg=="; }; }; + "cluster-key-slot-1.1.0" = { + name = "cluster-key-slot"; + packageName = "cluster-key-slot"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz"; + sha512 = "2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw=="; + }; + }; + "cmd-shim-2.1.0" = { + name = "cmd-shim"; + packageName = "cmd-shim"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.1.0.tgz"; + sha512 = "A5C0Cyf2H8sKsHqX0tvIWRXw5/PK++3Dc0lDbsugr90nOECLLuSPahVQBG8pgmgiXgm/TzBWMqI2rWdZwHduAw=="; + }; + }; "cmd-shim-3.0.3" = { name = "cmd-shim"; packageName = "cmd-shim"; @@ -17780,13 +17906,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.124" = { + "constructs-3.3.128" = { name = "constructs"; packageName = "constructs"; - version = "3.3.124"; + version = "3.3.128"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.124.tgz"; - sha512 = "Jj/I48WUvCUudNOJYslOXCFgPK+rg8x0JQdUpfUHh1YA2/uE9LheTHgm+yMg9BGlrfgulAUIc8bg3eUJlVNK0g=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.128.tgz"; + sha512 = "rTU6aYZf0EZHpoMQ4mU23zZQAVYwmBPC/78w75diEmBs9DN4VSQ2tXm2um4OwpPUCu5jLMkhcdsRwdFpAlQdxQ=="; }; }; "consume-http-header-1.0.0" = { @@ -17862,13 +17988,13 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.31.0" = { + "contentful-management-7.32.0" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.31.0"; + version = "7.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.31.0.tgz"; - sha512 = "YhPikvkO/ckRTO400I+iHYpVLuHwPyMzTQcMwBWpUluXYCF45I/RpWw7cyNQciQ19Q0NpjgEfUTQnhFhIqHtwA=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.32.0.tgz"; + sha512 = "L3W3XuSwRzW5X0iVj4rwW8IGSc8+yr+VIzSmTzu5aJv0qVGpYyIAq741nhZj8WhnkJJJu1JisZaRNbj6mGe1wQ=="; }; }; "contentful-sdk-core-6.8.0" = { @@ -17943,6 +18069,15 @@ let sha512 = "jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA=="; }; }; + "conventional-changelog-3.1.24" = { + name = "conventional-changelog"; + packageName = "conventional-changelog"; + version = "3.1.24"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-3.1.24.tgz"; + sha512 = "ed6k8PO00UVvhExYohroVPXcOJ/K1N0/drJHx/faTH37OIZthlecuLIRX/T6uOp682CAoVoFpu+sSEaeuH6Asg=="; + }; + }; "conventional-changelog-angular-5.0.12" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; @@ -17952,6 +18087,33 @@ let sha512 = "5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw=="; }; }; + "conventional-changelog-atom-2.0.8" = { + name = "conventional-changelog-atom"; + packageName = "conventional-changelog-atom"; + version = "2.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-2.0.8.tgz"; + sha512 = "xo6v46icsFTK3bb7dY/8m2qvc8sZemRgdqLb/bjpBsH2UyOS8rKNTgcb5025Hri6IpANPApbXMg15QLb1LJpBw=="; + }; + }; + "conventional-changelog-codemirror-2.0.8" = { + name = "conventional-changelog-codemirror"; + packageName = "conventional-changelog-codemirror"; + version = "2.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.8.tgz"; + sha512 = "z5DAsn3uj1Vfp7po3gpt2Boc+Bdwmw2++ZHa5Ak9k0UKsYAO5mH1UBTN0qSCuJZREIhX6WU4E1p3IW2oRCNzQw=="; + }; + }; + "conventional-changelog-conventionalcommits-4.6.0" = { + name = "conventional-changelog-conventionalcommits"; + packageName = "conventional-changelog-conventionalcommits"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.0.tgz"; + sha512 = "sj9tj3z5cnHaSJCYObA9nISf7eq/YjscLPoq6nmew4SiOjxqL2KRpK20fjnjVbpNDjJ2HR3MoVcWKXwbVvzS0A=="; + }; + }; "conventional-changelog-core-4.2.3" = { name = "conventional-changelog-core"; packageName = "conventional-changelog-core"; @@ -17961,6 +18123,51 @@ let sha512 = "MwnZjIoMRL3jtPH5GywVNqetGILC7g6RQFvdb8LRU/fA/338JbeWAku3PZ8yQ+mtVRViiISqJlb0sOz0htBZig=="; }; }; + "conventional-changelog-ember-2.0.9" = { + name = "conventional-changelog-ember"; + packageName = "conventional-changelog-ember"; + version = "2.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-2.0.9.tgz"; + sha512 = "ulzIReoZEvZCBDhcNYfDIsLTHzYHc7awh+eI44ZtV5cx6LVxLlVtEmcO+2/kGIHGtw+qVabJYjdI5cJOQgXh1A=="; + }; + }; + "conventional-changelog-eslint-3.0.9" = { + name = "conventional-changelog-eslint"; + packageName = "conventional-changelog-eslint"; + version = "3.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.9.tgz"; + sha512 = "6NpUCMgU8qmWmyAMSZO5NrRd7rTgErjrm4VASam2u5jrZS0n38V7Y9CzTtLT2qwz5xEChDR4BduoWIr8TfwvXA=="; + }; + }; + "conventional-changelog-express-2.0.6" = { + name = "conventional-changelog-express"; + packageName = "conventional-changelog-express"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-2.0.6.tgz"; + sha512 = "SDez2f3iVJw6V563O3pRtNwXtQaSmEfTCaTBPCqn0oG0mfkq0rX4hHBq5P7De2MncoRixrALj3u3oQsNK+Q0pQ=="; + }; + }; + "conventional-changelog-jquery-3.0.11" = { + name = "conventional-changelog-jquery"; + packageName = "conventional-changelog-jquery"; + version = "3.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.11.tgz"; + sha512 = "x8AWz5/Td55F7+o/9LQ6cQIPwrCjfJQ5Zmfqi8thwUEKHstEn4kTIofXub7plf1xvFA2TqhZlq7fy5OmV6BOMw=="; + }; + }; + "conventional-changelog-jshint-2.0.9" = { + name = "conventional-changelog-jshint"; + packageName = "conventional-changelog-jshint"; + version = "2.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.9.tgz"; + sha512 = "wMLdaIzq6TNnMHMy31hql02OEQ8nCQfExw1SE0hYL5KvU+JCTuPaDO+7JiogGT2gJAxiUGATdtYYfh+nT+6riA=="; + }; + }; "conventional-changelog-preset-loader-2.3.4" = { name = "conventional-changelog-preset-loader"; packageName = "conventional-changelog-preset-loader"; @@ -18294,31 +18501,31 @@ let sha512 = "5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g=="; }; }; - "core-js-3.16.1" = { + "core-js-3.16.2" = { name = "core-js"; packageName = "core-js"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.16.1.tgz"; - sha512 = "AAkP8i35EbefU+JddyWi12AWE9f2N/qr/pwnDtWz4nyUIBGMJPX99ANFFRSw6FefM374lDujdtLDyhN2A/btHw=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.16.2.tgz"; + sha512 = "P0KPukO6OjMpjBtHSceAZEWlDD1M2Cpzpg6dBbrjFqFhBHe/BwhxaP820xKOjRn/lZRQirrCusIpLS/n2sgXLQ=="; }; }; - "core-js-compat-3.16.1" = { + "core-js-compat-3.16.2" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.1.tgz"; - sha512 = "NHXQXvRbd4nxp9TEmooTJLUf94ySUG6+DSsscBpTftN1lQLQ4LjnWvc7AoIo4UjDsFF3hB8Uh5LLCRRdaiT5MQ=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.2.tgz"; + sha512 = "4lUshXtBXsdmp8cDWh6KKiHUg40AjiuPD3bOWkNVsr1xkAhpUqCjaZ8lB1bKx9Gb5fXcbRbFJ4f4qpRIRTuJqQ=="; }; }; - "core-js-pure-3.16.1" = { + "core-js-pure-3.16.2" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.1.tgz"; - sha512 = "TyofCdMzx0KMhi84mVRS8rL1XsRk2SPUNz2azmth53iRN0/08Uim9fdhQTaZTG1LqaXHYVci4RDHka6WrXfnvg=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.2.tgz"; + sha512 = "oxKe64UH049mJqrKkynWp6Vu0Rlm/BTXO/bJZuN2mmR3RtOFNepLlSWDd1eo16PzHpQAoNG97rLU1V/YxesJjw=="; }; }; "core-util-is-1.0.2" = { @@ -18429,15 +18636,6 @@ let sha1 = "aba6c5833be410d45b1eca3e6d583844ce682c77"; }; }; - "cp-file-6.2.0" = { - name = "cp-file"; - packageName = "cp-file"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cp-file/-/cp-file-6.2.0.tgz"; - sha512 = "fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA=="; - }; - }; "cp-file-7.0.0" = { name = "cp-file"; packageName = "cp-file"; @@ -18555,13 +18753,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-1.11.0" = { + "create-gatsby-1.12.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.11.0.tgz"; - sha512 = "3FM3YJI5OExHIUUiJSASBibwzo7oBKtQYxHB0YeLC/7U7rkSJWjSbJ+cJllC+NeCGoDIzZ21QTkhczzzz7j1FQ=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.12.0.tgz"; + sha512 = "d8wlwgNgKrmd6J+cr4z1Hsis+sCwr9LoxnqSFqFzXcWowlODS5NP8gUZdCZ54hHd+0qIuAA77Wp67GAyhkFlCA=="; }; }; "create-graphback-1.0.1" = { @@ -18618,6 +18816,15 @@ let sha512 = "Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg=="; }; }; + "cron-parser-2.18.0" = { + name = "cron-parser"; + packageName = "cron-parser"; + version = "2.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cron-parser/-/cron-parser-2.18.0.tgz"; + sha512 = "s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg=="; + }; + }; "cronosjs-1.7.1" = { name = "cronosjs"; packageName = "cronosjs"; @@ -19383,13 +19590,13 @@ let sha512 = "4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw=="; }; }; - "d3-7.0.0" = { + "d3-7.0.1" = { name = "d3"; packageName = "d3"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/d3/-/d3-7.0.0.tgz"; - sha512 = "t+jEKGO2jQiSBLJYYq6RFc500tsCeXBB4x41oQaSnZD3Som95nQrlw9XJGrFTMUOQOkwSMauWy9+8Tz1qm9UZw=="; + url = "https://registry.npmjs.org/d3/-/d3-7.0.1.tgz"; + sha512 = "74zonD4nAtxF9dtwFwJ3RuoHPh2D/UTFX26midBuMVH+7pRbOezuyLUIb8mbQMuYFlcUXT+xy++orCmnvMM/CA=="; }; }; "d3-array-1.2.4" = { @@ -19410,13 +19617,13 @@ let sha512 = "B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ=="; }; }; - "d3-array-3.0.1" = { + "d3-array-3.0.2" = { name = "d3-array"; packageName = "d3-array"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/d3-array/-/d3-array-3.0.1.tgz"; - sha512 = "l3Bh5o8RSoC3SBm5ix6ogaFW+J6rOUm42yOtZ2sQPCEvCqUMepeX7zgrlLLGIemxgOyo9s2CsWEidnLv5PwwRw=="; + url = "https://registry.npmjs.org/d3-array/-/d3-array-3.0.2.tgz"; + sha512 = "nTN4OC6ufZueotlexbxBd2z8xmG1eIfhvP2m1auH2ONps0L+AZn1r0JWuzMXZ6XgOj1VBOp7GGZmEs9NUFEBbA=="; }; }; "d3-axis-1.0.12" = { @@ -21048,6 +21255,15 @@ let sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; }; }; + "default-gateway-6.0.3" = { + name = "default-gateway"; + packageName = "default-gateway"; + version = "6.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz"; + sha512 = "fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg=="; + }; + }; "default-resolution-2.0.0" = { name = "default-resolution"; packageName = "default-resolution"; @@ -21300,6 +21516,15 @@ let sha512 = "CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ=="; }; }; + "denque-1.5.1" = { + name = "denque"; + packageName = "denque"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz"; + sha512 = "XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw=="; + }; + }; "dep-graph-1.1.0" = { name = "dep-graph"; packageName = "dep-graph"; @@ -22848,13 +23073,13 @@ let sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; }; - "electron-13.1.9" = { + "electron-13.2.1" = { name = "electron"; packageName = "electron"; - version = "13.1.9"; + version = "13.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/electron/-/electron-13.1.9.tgz"; - sha512 = "By4Zb72XNQLrPb70BXdIW3NtEHFwybP5DIQjohnCxOYONq5vojuHjNcTuWnBgMvwQ2qwykk6Tw5EwF2Pt0CWjA=="; + url = "https://registry.npmjs.org/electron/-/electron-13.2.1.tgz"; + sha512 = "/K0Uw+o3+phbHtrVL6qDFVJqmeRF6EIPwVeUHEH5R8JNy13f4X3RouKjQzVyY/Os8fEqYHGFONWhD6q6g750HQ=="; }; }; "electron-notarize-1.1.0" = { @@ -22893,13 +23118,22 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.806" = { + "electron-to-chromium-1.3.813" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.806"; + version = "1.3.813"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.806.tgz"; - sha512 = "AH/otJLAAecgyrYp0XK1DPiGVWcOgwPeJBOLeuFQ5l//vhQhwC9u6d+GijClqJAmsHG4XDue81ndSQPohUu0xA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.813.tgz"; + sha512 = "YcSRImHt6JZZ2sSuQ4Bzajtk98igQ0iKkksqlzZLzbh4p0OIyJRSvUbsgqfcR8txdfsoYCc4ym306t4p2kP/aw=="; + }; + }; + "electron-to-chromium-1.3.814" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.3.814"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.814.tgz"; + sha512 = "0mH03cyjh6OzMlmjauGg0TLd87ErIJqWiYxMcOLKf5w6p0YEOl7DJAj7BDlXEFmCguY5CQaKVOiMjAMODO2XDw=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -24857,13 +25091,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.92" = { + "expo-pwa-0.0.93" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.92"; + version = "0.0.93"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.92.tgz"; - sha512 = "lY+m28IQkqpCPZQdAlMBUGgm5HbTEHVaMNt0QnMAeX/siN11rfhxBr2nFQRYfK0R5Kklh6yUTyAjz+vOd2bSKw=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.93.tgz"; + sha512 = "WxmDFqFDtHwyzqHb0p5XDXxm0bWNTkTiViWQl48tGGAhCNKcLOVTFIfMwBK0VGrq6yWopNCNEu3E+nldnJq15g=="; }; }; "express-2.5.11" = { @@ -25361,15 +25595,6 @@ let sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; }; }; - "fast-equals-1.6.3" = { - name = "fast-equals"; - packageName = "fast-equals"; - version = "1.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-equals/-/fast-equals-1.6.3.tgz"; - sha512 = "4WKW0AL5+WEqO0zWavAfYGY1qwLsBgE//DN4TTcVEN2UlINgkv9b3vm2iHicoenWKSX9mKWmGOsU/iI5IST7pQ=="; - }; - }; "fast-equals-2.0.3" = { name = "fast-equals"; packageName = "fast-equals"; @@ -25487,15 +25712,6 @@ let sha1 = "a45aff345196006d406ca6cdcd05f69051ef35b8"; }; }; - "fast-printf-1.6.6" = { - name = "fast-printf"; - packageName = "fast-printf"; - version = "1.6.6"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-printf/-/fast-printf-1.6.6.tgz"; - sha512 = "Uz/uW6R1Fd8YqCGeoQosRIfB4dBbr8uMbFVdEci2AyXYcfucFqhpSMAGs8skRRdZd+MGCDBu48+B8Zmu7Pta5A=="; - }; - }; "fast-redact-3.0.1" = { name = "fast-redact"; packageName = "fast-redact"; @@ -25523,15 +25739,6 @@ let sha512 = "lXatBjf3WPjmWD6DpIZxkeSsCOwqI0maYMpgDlx8g4U2qi4lbjA9oH/HD2a87G+KfsUmo5WbJFmqBZlPxtptag=="; }; }; - "fast-stringify-1.1.2" = { - name = "fast-stringify"; - packageName = "fast-stringify"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-stringify/-/fast-stringify-1.1.2.tgz"; - sha512 = "SfslXjiH8km0WnRiuPfpUKwlZjW5I878qsOm+2x8x3TgqmElOOLh1rgJFb+PolNdNRK3r8urEefqx0wt7vx1dA=="; - }; - }; "fast-text-encoding-1.0.3" = { name = "fast-text-encoding"; packageName = "fast-text-encoding"; @@ -25586,13 +25793,13 @@ let sha512 = "XJ+vbiXYjmxc32VEpXScAq7mBg3vqh90OjLfiuyQ0zAtXpgICdVgGjKHep1kLGQufyuCBiEYpl6ZKcw79chTpA=="; }; }; - "fastq-1.11.1" = { + "fastq-1.12.0" = { name = "fastq"; packageName = "fastq"; - version = "1.11.1"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.11.1.tgz"; - sha512 = "HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.12.0.tgz"; + sha512 = "VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg=="; }; }; "fault-1.0.4" = { @@ -26477,13 +26684,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.157.0" = { + "flow-parser-0.158.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.157.0"; + version = "0.158.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.157.0.tgz"; - sha512 = "p0vdtrM8oAMlscIXpX0e/eGWll5NPteVChNtlQncbIbivH+BdiwXHN5QO6myAfmebd027r9RiQKdUPsFAiEVgQ=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.158.0.tgz"; + sha512 = "0hMsPkBTRrkII/0YiG9ehOxFXy4gOWdk8RSRze5WbfeKAQpL5kC2K4BmumyTfU9o5gr7/llgElF3UpSSrjzQAA=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -26648,13 +26855,13 @@ let sha512 = "VjAQdSLsl6AkpZNyrQJfO7BXLo4chnStqb055bumZMbRUPpVuPN3a4ktsnRCmrFZjtMlYLkyXiR5rAs4WOpC4Q=="; }; }; - "follow-redirects-1.14.1" = { + "follow-redirects-1.14.2" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz"; - sha512 = "HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz"; + sha512 = "yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA=="; }; }; "follow-redirects-1.5.10" = { @@ -27467,31 +27674,31 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-2.11.0" = { + "gatsby-core-utils-2.12.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "2.11.0"; + version = "2.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.11.0.tgz"; - sha512 = "t5PL1/MvTPSG6IeJn+Yd3Fxp0L3HfLI1vvVsmxXvxEiwDp5MJjjtZbrSnWpST1oylMSKI/UECUEKQUax9UJW+A=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.12.0.tgz"; + sha512 = "aN9fub3XX/uEqAstxG3mr8BH6hMGhTmAzANZH3HSV4tyG1Y4a4FKisZA0ggmy/dKOy5cyeuoMHmzAr8+qtHcAw=="; }; }; - "gatsby-recipes-0.22.0" = { + "gatsby-recipes-0.23.0" = { name = "gatsby-recipes"; packageName = "gatsby-recipes"; - version = "0.22.0"; + version = "0.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.22.0.tgz"; - sha512 = "FQrM59qd64Pwe6UVJmuTAwyZx4IVkj0huwZ1y37IWn49Xuq0Ihhmsrb1BgP99euXZz34c+PWhsFnWvW26skgtw=="; + url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.23.0.tgz"; + sha512 = "dR/u2mFiWhPf+0O8MuFfnl5JTbjOChYKG9+CIhubLwAjJN0cDbvleSJEQ7K32quKd56dqNf1psXqpZ+UUlx8vA=="; }; }; - "gatsby-telemetry-2.11.0" = { + "gatsby-telemetry-2.12.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "2.11.0"; + version = "2.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.11.0.tgz"; - sha512 = "6GEcZpsY5N/+K+SGGdDHuOknjer6vsYLJsUuUWkz32t8OK9lE1cLvXIdO2eTHdS4rtWFM324a/yFMlizp59SbA=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.12.0.tgz"; + sha512 = "W27oKt7/ThrNz12lPiclb9J7v/Q6ZM5Eh+JQ5w/TRFs4vqLOsfJZxmYG2HzFvAZtoFUB1JsbvmHZDMxUtR84Uw=="; }; }; "gauge-1.2.7" = { @@ -28530,13 +28737,13 @@ let sha512 = "9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg=="; }; }; - "globby-12.0.0" = { + "globby-12.0.1" = { name = "globby"; packageName = "globby"; - version = "12.0.0"; + version = "12.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-12.0.0.tgz"; - sha512 = "3mOIUduqSMHm6gNjIw9E641TZ93NB8lFVt+6MKIw6vUaIS5aSsw/6cl0gT86z1IoKlaL90BiOQlA593GUMlzEA=="; + url = "https://registry.npmjs.org/globby/-/globby-12.0.1.tgz"; + sha512 = "AofdCGi+crQ1uN9+nMbTnvC4XGNPJN9hRiPf+A76lUZIZoWoj4Z9iyUQGge7xCGKgR/7ejB36qoIlLoDBc7fYw=="; }; }; "globby-4.1.0" = { @@ -28602,13 +28809,13 @@ let sha512 = "uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg=="; }; }; - "globule-1.3.2" = { + "globule-1.3.3" = { name = "globule"; packageName = "globule"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz"; - sha512 = "7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA=="; + url = "https://registry.npmjs.org/globule/-/globule-1.3.3.tgz"; + sha512 = "mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg=="; }; }; "glogg-1.0.2" = { @@ -28656,13 +28863,13 @@ let sha512 = "Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ=="; }; }; - "google-auth-library-7.6.1" = { + "google-auth-library-7.6.2" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "7.6.1"; + version = "7.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.6.1.tgz"; - sha512 = "aP/WTx+rE3wQ3zPgiCZsJ1EIb2v7P+QwxVwAqrKjcPz4SK57kyAfcX75VoAgjtwZzl70upcNlvFn8FSmC4nMBQ=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.6.2.tgz"; + sha512 = "yvEnwVsvgH8RXTtpf6e84e7dqIdUEKJhmQvTJwzYP+RDdHjLrDp9sk2u2ZNDJPLKZ7DJicx/+AStcQspJiq+Qw=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -28674,13 +28881,13 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.24.0" = { + "google-gax-2.24.2" = { name = "google-gax"; packageName = "google-gax"; - version = "2.24.0"; + version = "2.24.2"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.24.0.tgz"; - sha512 = "PtE/Zk3jPrUIAL9YsIq5e+04U3aqEg6/0DmtR/tXKhbcS7SRA1sbPZja+vevuUavIdCXEiBbaKkrBqcQvSxXmw=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.24.2.tgz"; + sha512 = "4OtyEIt/KAXRX5o2W/6DGf8MnMs1lMXwcGoPHR4PwXfTUVKjK7ywRe2/yRIMkYEDzAwu/kppPgfpX+kCG2rWfw=="; }; }; "google-p12-pem-3.1.2" = { @@ -30204,6 +30411,15 @@ let sha512 = "8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA=="; }; }; + "html-entities-2.3.2" = { + name = "html-entities"; + packageName = "html-entities"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz"; + sha512 = "c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ=="; + }; + }; "html-loader-1.1.0" = { name = "html-loader"; packageName = "html-loader"; @@ -30538,6 +30754,15 @@ let sha512 = "13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg=="; }; }; + "http-proxy-middleware-2.0.1" = { + name = "http-proxy-middleware"; + packageName = "http-proxy-middleware"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz"; + sha512 = "cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg=="; + }; + }; "http-signature-0.11.0" = { name = "http-signature"; packageName = "http-signature"; @@ -31501,13 +31726,13 @@ let sha512 = "zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw=="; }; }; - "init-package-json-2.0.3" = { + "init-package-json-2.0.4" = { name = "init-package-json"; packageName = "init-package-json"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/init-package-json/-/init-package-json-2.0.3.tgz"; - sha512 = "tk/gAgbMMxR6fn1MgMaM1HpU1ryAmBWWitnxG5OhuNXeX0cbpbgV5jA4AIpQJVNoyOfOevTtO6WX+rPs+EFqaQ=="; + url = "https://registry.npmjs.org/init-package-json/-/init-package-json-2.0.4.tgz"; + sha512 = "gUACSdZYka+VvnF90TsQorC+1joAVWNI724vBNj3RD0LLMeDss2IuzaeiQs0T4YzKs76BPHtrp/z3sn2p+KDTw=="; }; }; "ink-2.7.1" = { @@ -31861,6 +32086,15 @@ let sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; + "internal-ip-6.2.0" = { + name = "internal-ip"; + packageName = "internal-ip"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/internal-ip/-/internal-ip-6.2.0.tgz"; + sha512 = "D8WGsR6yDt8uq7vDMu7mjcR+yRMm3dW8yufyChmszWRjcSHuxLBkR3GdS2HZAjodsaGuCvXeEJpueisXJULghg=="; + }; + }; "internal-slot-1.0.3" = { name = "internal-slot"; packageName = "internal-slot"; @@ -32023,6 +32257,15 @@ let sha512 = "UnU0bS3+cMA2UvYrF5RXp/Hm7v/nYiA3F0GVCOeRmDiZmXAt/eO7KdqyRzewopvhBlev7F7t7GZzRRYY1XE3xg=="; }; }; + "ioredis-4.27.8" = { + name = "ioredis"; + packageName = "ioredis"; + version = "4.27.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ioredis/-/ioredis-4.27.8.tgz"; + sha512 = "AcMEevap2wKxNcYEybZ/Qp+MR2HbNNUwGjG4sVCC3cAJ/zR9HXKAkolXOuR6YcOGPf7DHx9mWb/JKtAGujyPow=="; + }; + }; "iota-array-1.0.0" = { name = "iota-array"; packageName = "iota-array"; @@ -32410,13 +32653,13 @@ let sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; }; }; - "is-core-module-2.5.0" = { + "is-core-module-2.6.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz"; - sha512 = "TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz"; + sha512 = "wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ=="; }; }; "is-data-descriptor-0.1.4" = { @@ -32779,6 +33022,15 @@ let sha1 = "307a855b3cf1a938b44ea70d2c61106053714f34"; }; }; + "is-ip-3.1.0" = { + name = "is-ip"; + packageName = "is-ip"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ip/-/is-ip-3.1.0.tgz"; + sha512 = "35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q=="; + }; + }; "is-lambda-1.0.1" = { name = "is-lambda"; packageName = "is-lambda"; @@ -32833,6 +33085,15 @@ let sha512 = "VTPuvvGQtxvCeghwspQu1rBgjYUT6FGxPlvFKbYuFtgc4ADsX3U5ihZOYN0qyU6u+d4X9xXb0IT5O6QpXKt87A=="; }; }; + "is-nan-1.3.2" = { + name = "is-nan"; + packageName = "is-nan"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz"; + sha512 = "E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w=="; + }; + }; "is-natural-number-4.0.1" = { name = "is-natural-number"; packageName = "is-natural-number"; @@ -33895,15 +34156,6 @@ let sha512 = "z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A=="; }; }; - "jest-get-type-24.9.0" = { - name = "jest-get-type"; - packageName = "jest-get-type"; - version = "24.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz"; - sha512 = "lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q=="; - }; - }; "jest-get-type-25.2.6" = { name = "jest-get-type"; packageName = "jest-get-type"; @@ -33913,6 +34165,15 @@ let sha512 = "DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig=="; }; }; + "jest-get-type-26.3.0" = { + name = "jest-get-type"; + packageName = "jest-get-type"; + version = "26.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz"; + sha512 = "TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig=="; + }; + }; "jest-haste-map-25.5.1" = { name = "jest-haste-map"; packageName = "jest-haste-map"; @@ -33949,15 +34210,6 @@ let sha512 = "KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA=="; }; }; - "jest-validate-24.9.0" = { - name = "jest-validate"; - packageName = "jest-validate"; - version = "24.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz"; - sha512 = "HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ=="; - }; - }; "jest-validate-25.5.0" = { name = "jest-validate"; packageName = "jest-validate"; @@ -33967,6 +34219,15 @@ let sha512 = "okUFKqhZIpo3jDdtUXUZ2LxGUZJIlfdYBvZb1aczzxrlyMlqdnnws9MOxezoLGhSaFc2XYaHNReNQfj5zPIWyQ=="; }; }; + "jest-validate-26.6.2" = { + name = "jest-validate"; + packageName = "jest-validate"; + version = "26.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz"; + sha512 = "NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ=="; + }; + }; "jest-worker-25.5.0" = { name = "jest-worker"; packageName = "jest-worker"; @@ -34003,13 +34264,13 @@ let sha512 = "dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww=="; }; }; - "jitdb-3.1.7" = { + "jitdb-3.2.0" = { name = "jitdb"; packageName = "jitdb"; - version = "3.1.7"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jitdb/-/jitdb-3.1.7.tgz"; - sha512 = "AV5AnBPlrQO75I3MKJFQMzQyM0ZQDwKcij299C1kBXt/U7dDqwQa8FaYYiHnbK8w9J4qXsvQOlM8P5HGY24zBQ=="; + url = "https://registry.npmjs.org/jitdb/-/jitdb-3.2.0.tgz"; + sha512 = "h44dG1Ba5eCIUcyekuH2PjrQa6GQ0s6hlwUUWZ+F0Q7OmFacwlUxJzvatDzRfWtRDkHFkv3+KDEN3dNMSougqg=="; }; }; "jju-1.4.0" = { @@ -34453,13 +34714,13 @@ let sha512 = "cUhDs2V2wYg7LFgm/X/uken8oF9re3vRORD08s0+z9Re8tt0pEehKmCotx3HYFhYrRhCEVvm66xjQt0t62GzXg=="; }; }; - "jsii-srcmak-0.1.326" = { + "jsii-srcmak-0.1.329" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.326"; + version = "0.1.329"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.326.tgz"; - sha512 = "euZGdUcdZHI/cycrBZ7AVDea7Du2qu7TIzctEXUDuubtZ/n66rxWCQnlo/NsaQYx4HXkY47xaoVlRg69lhciZA=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.329.tgz"; + sha512 = "H4Sw8Ek33JeP7cHHAe6m4BZivwRqW6rq8X/IMleaLpzK9QAiJykf7wYV4+TSpeBUpdoipshFcnefzXtNny8iwA=="; }; }; "json-bigint-1.0.0" = { @@ -34759,13 +35020,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.296" = { + "json2jsii-0.2.1" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.296"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.296.tgz"; - sha512 = "sr2xUhMuUMMtDqxckludB4fZ+64xJ8K+HODXVO/jbkv0QND5I8PmHwz0IqjqGkpUNHqJkYvXzn06tgXy/V1WeQ=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.1.tgz"; + sha512 = "e7440eXg2IgXd/C/clf9+ttc/DGoUTrOUErumLKaalc4oVi9S6yDyd7sWS3cxoUBtq8+USCON2OTyDHII6x60g=="; }; }; "json3-3.2.6" = { @@ -34966,6 +35227,15 @@ let sha512 = "CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg=="; }; }; + "jsonrpc2-ws-1.0.0-beta9" = { + name = "jsonrpc2-ws"; + packageName = "jsonrpc2-ws"; + version = "1.0.0-beta9"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonrpc2-ws/-/jsonrpc2-ws-1.0.0-beta9.tgz"; + sha512 = "0KA+ufhSy7gN2/jGXagXLz4V5m+vymmNTI5IpNBIUiunday45P6dspdaOO0wwt2JJyrACC/BKMH154OqsuB80w=="; + }; + }; "jsonschema-1.4.0" = { name = "jsonschema"; packageName = "jsonschema"; @@ -35534,6 +35804,15 @@ let sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="; }; }; + "kleur-4.1.4" = { + name = "kleur"; + packageName = "kleur"; + version = "4.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/kleur/-/kleur-4.1.4.tgz"; + sha512 = "8QADVssbrFjivHWQU7KkMgptGTl6WAcSdlbBPY4uNF+mWr6DGcKrvY2w4FQJoXch7+fKMjj0dRrL75vk3k23OA=="; + }; + }; "knockout-3.5.1" = { name = "knockout"; packageName = "knockout"; @@ -36173,6 +36452,15 @@ let sha512 = "HtEF7Lsw8qdEeQTsYY6c6QK6PFrG0YV3OBPWL6VnsAr25t+HDEsH/Fna6EIivqrQ8SVDjqX5YwMcAhunTelaVA=="; }; }; + "lightning-4.1.0" = { + name = "lightning"; + packageName = "lightning"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-4.1.0.tgz"; + sha512 = "ngS2829bxBMgK/MFanm6jypvpIbxzxBX/vFbUKyFrj3MxcSKvMQzr1sXRppYxZXHwOuqyiN91QnaKNg3upQ9sg=="; + }; + }; "lilconfig-2.0.3" = { name = "lilconfig"; packageName = "lilconfig"; @@ -36353,6 +36641,15 @@ let sha512 = "JxGGEqu1MJ1jnJN0cWWBsmEqi9qwbvsfM/AHslvKv7WHhMYFthp9HgGGcLn23oiYMM1boGtvqtkWuvqMf9P8AQ=="; }; }; + "ln-service-52.0.1" = { + name = "ln-service"; + packageName = "ln-service"; + version = "52.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-52.0.1.tgz"; + sha512 = "ETL/rpidWMS7nCsZoRb3/0vU5nk7RE1PRtn3YBnmUWJcdhjREPhQRLHm7/vZ+JFRdAwvW7V/lqCvOkDZXCKo6w=="; + }; + }; "ln-sync-0.4.7" = { name = "ln-sync"; packageName = "ln-sync"; @@ -36506,13 +36803,13 @@ let sha512 = "uxKD2HIj042/HBx77NBcmEPsD+hxCgAtjEWlYNScuUjIsh/62Uyu39GOR68TBR68v+jqDL9zfftCWoUo4y03sQ=="; }; }; - "localforage-1.9.0" = { + "localforage-1.10.0" = { name = "localforage"; packageName = "localforage"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/localforage/-/localforage-1.9.0.tgz"; - sha512 = "rR1oyNrKulpe+VM9cYmcFn6tsHuokyVHFaCM3+osEmxaHTbEk8oQu6eGDfS6DQLWi/N67XRmB8ECG37OES368g=="; + url = "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz"; + sha512 = "14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg=="; }; }; "locate-java-home-1.1.2" = { @@ -37856,6 +38153,15 @@ let sha1 = "a3a17bbf62eeb6240f491846e97c1c4e2a5e1e21"; }; }; + "lodash.uniqby-4.7.0" = { + name = "lodash.uniqby"; + packageName = "lodash.uniqby"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz"; + sha1 = "d99c07a669e9e6d24e1362dfe266c67616af1302"; + }; + }; "lodash.upperfirst-4.3.1" = { name = "lodash.upperfirst"; packageName = "lodash.upperfirst"; @@ -37910,13 +38216,13 @@ let sha512 = "U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg=="; }; }; - "log-process-errors-5.1.2" = { + "log-process-errors-6.3.0" = { name = "log-process-errors"; packageName = "log-process-errors"; - version = "5.1.2"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/log-process-errors/-/log-process-errors-5.1.2.tgz"; - sha512 = "s4kmYHrzj543xUAIxc/cpmoiGZcbFwKRqqwO49DbgH+hFoSTswi0sYZuJKjUUc73b49MRPQGl0CNl8cx98/Wtg=="; + url = "https://registry.npmjs.org/log-process-errors/-/log-process-errors-6.3.0.tgz"; + sha512 = "dHwGgWFuz9LUDoLIG7E0SlDurosfZEpgNLJMPzNL9GPdyh4Wdm5RJlQbuqy3Pj2wOcbDzykeTCBEqyrwriqPnA=="; }; }; "log-symbols-1.0.2" = { @@ -38576,13 +38882,13 @@ let sha512 = "EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ=="; }; }; - "make-fetch-happen-9.0.4" = { + "make-fetch-happen-9.0.5" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "9.0.4"; + version = "9.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.4.tgz"; - sha512 = "sQWNKMYqSmbAGXqJg2jZ+PmHh5JAybvwu0xM8mZR/bsTjGiTASj3ldXJV7KFHy1k/IJIBkjxQFoWIVsv9+PQMg=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.5.tgz"; + sha512 = "XN0i/VqHsql30Oq7179spk6vu3IuaPL1jaivNYhBrJtK7tkOuJwMK2IlROiOnJ40b9SvmOo2G86FZyI6LD2EsQ=="; }; }; "make-iterator-1.0.1" = { @@ -39557,6 +39863,15 @@ let sha512 = "Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q=="; }; }; + "mem-8.1.1" = { + name = "mem"; + packageName = "mem"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz"; + sha512 = "qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA=="; + }; + }; "mem-fs-2.2.1" = { name = "mem-fs"; packageName = "mem-fs"; @@ -39989,15 +40304,6 @@ let sha512 = "y0y6CUB9RLVsy3kfgayU28746QrNMpSm9O/AYGNsBgOkJr/X/Jk0VLGoO8Ude7Bpa8adywzF+MzXNZRFRsNPhg=="; }; }; - "micro-memoize-2.1.2" = { - name = "micro-memoize"; - packageName = "micro-memoize"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/micro-memoize/-/micro-memoize-2.1.2.tgz"; - sha512 = "COjNutiFgnDHXZEIM/jYuZPwq2h8zMUeScf6Sh6so98a+REqdlpaNS7Cb2ffGfK5I+xfgoA3Rx49NGuNJTJq3w=="; - }; - }; "micro-memoize-4.0.9" = { name = "micro-memoize"; packageName = "micro-memoize"; @@ -40862,13 +41168,13 @@ let sha512 = "hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ=="; }; }; - "mocha-9.0.3" = { + "mocha-9.1.0" = { name = "mocha"; packageName = "mocha"; - version = "9.0.3"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.0.3.tgz"; - sha512 = "hnYFrSefHxYS2XFGtN01x8un0EwNu2bzKvhpRFhgoybIvMaOkkL60IVPmkb5h6XDmUl4IMSB+rT5cIO4/4bJgg=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.1.0.tgz"; + sha512 = "Kjg/XxYOFFUi0h/FwMOeb6RoroiZ+P1yOfya6NK7h3dNhahrJx1r2XIT3ge4ZQvJM86mdjNA+W5phqRQh7DwCg=="; }; }; "mock-require-3.0.3" = { @@ -40925,15 +41231,6 @@ let sha1 = "114c949673e2a8a35e9d35788527aa37b679da2b"; }; }; - "moize-5.4.7" = { - name = "moize"; - packageName = "moize"; - version = "5.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/moize/-/moize-5.4.7.tgz"; - sha512 = "7PZH8QFJ51cIVtDv7wfUREBd3gL59JB0v/ARA3RI9zkSRa9LyGjS1Bdldii2J1/NQXRQ/3OOVOSdnZrCcVaZlw=="; - }; - }; "moize-6.0.3" = { name = "moize"; packageName = "moize"; @@ -41069,15 +41366,6 @@ let sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; }; }; - "move-file-1.2.0" = { - name = "move-file"; - packageName = "move-file"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/move-file/-/move-file-1.2.0.tgz"; - sha512 = "USHrRmxzGowUWAGBbJPdFjHzEqtxDU03pLHY0Rfqgtnq+q8FOIs8wvkkf+Udmg77SJKs47y9sI0jJvQeYsmiCA=="; - }; - }; "move-file-2.1.0" = { name = "move-file"; packageName = "move-file"; @@ -42150,13 +42438,13 @@ let sha512 = "BiQblBf85/GmerTZYxVH/1A4/O8qBvg0Qr8QX0MvxjAvO3j+jDUk1PSudMxNgJjU1zFw5pKM2/DBk70hP5gt+Q=="; }; }; - "netlify-headers-parser-3.0.1" = { + "netlify-headers-parser-4.0.1" = { name = "netlify-headers-parser"; packageName = "netlify-headers-parser"; - version = "3.0.1"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-headers-parser/-/netlify-headers-parser-3.0.1.tgz"; - sha512 = "32oDkPa7+JdTFOp0M4H31AZDQ8YVJWgNlPkPuilb1C1dgvmAFXa8k4x+ADpgCbQfTMP3exO3vobvlfj8SUHxnA=="; + url = "https://registry.npmjs.org/netlify-headers-parser/-/netlify-headers-parser-4.0.1.tgz"; + sha512 = "Wq1ZKXLv8xnTmzWhjbkFnzIAAmas7GhtrFJXCeMfEoeGthuSekcEz+IMfpSDjhL/X3Ls5YIk9SuNUf/5/+TlEQ=="; }; }; "netlify-redirect-parser-11.0.2" = { @@ -42438,6 +42726,15 @@ let sha512 = "TBf8vh0NTD9DxG3oXQ1j/DCiREqDUI2khzJScZyq9w5AiYb+682WSjhl1f9Z1BJEjwWY7GFHQIpxxFVJ53OMfw=="; }; }; + "node-bindgen-loader-1.0.1" = { + name = "node-bindgen-loader"; + packageName = "node-bindgen-loader"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-bindgen-loader/-/node-bindgen-loader-1.0.1.tgz"; + sha512 = "j6kNHKSGLye9qpR/OQh1BhDqyfHqNUIEGicx4NFZLUtseYagfPLLn2qW7MPssbAuAmGvAqNmAwYcW1O1uvsXZA=="; + }; + }; "node-bitmap-0.0.1" = { name = "node-bitmap"; packageName = "node-bitmap"; @@ -42745,13 +43042,13 @@ let sha512 = "fPNFIp2hF/Dq7qLDzSg4vZ0J4e9v60gJR+Qx7RbjbWqzPDdEqeVpEx5CFeDAELIl+A/woaaNn1fQ5nEVerMxJg=="; }; }; - "node-object-hash-2.3.8" = { + "node-object-hash-2.3.9" = { name = "node-object-hash"; packageName = "node-object-hash"; - version = "2.3.8"; + version = "2.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.8.tgz"; - sha512 = "hg/4TUqBOFdEhKjLF4jnn64utX3OWPVPWunVaDsaKxY+TVoViOFyW4lu34DES8yAqAqULSFm2jFL9SqVGes0Zg=="; + url = "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.9.tgz"; + sha512 = "NQt1YURrMPeQGZzW4lRbshUEF2PqxJEZYY4XJ/L+q33dI8yPYvnb7QXmwUcl1EuXluzeY4TEV+H6H0EmtI6f5g=="; }; }; "node-persist-2.1.0" = { @@ -42808,13 +43105,13 @@ let sha512 = "dBljNubVsolJkgfXUAF3KrCAO+hi5AXz+cftGjfHT76PyVB9pFUbAgTrkjZmKciC/B/14kEV5Ds+SwonqyTMfg=="; }; }; - "node-releases-1.1.74" = { + "node-releases-1.1.75" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.74"; + version = "1.1.75"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.74.tgz"; - sha512 = "caJBVempXZPepZoZAPCWRTNxYQ+xtG/KAi4ozTA5A+nJ7IU+kLQCbqaUjb5Rwy14M9upBWiQ4NutcmW04LJSRw=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz"; + sha512 = "Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw=="; }; }; "node-source-walk-4.2.0" = { @@ -43087,13 +43384,13 @@ let sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; - "normalize-package-data-3.0.2" = { + "normalize-package-data-3.0.3" = { name = "normalize-package-data"; packageName = "normalize-package-data"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz"; - sha512 = "6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg=="; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz"; + sha512 = "p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA=="; }; }; "normalize-path-2.1.1" = { @@ -44024,13 +44321,13 @@ let sha512 = "0HGaSR/E/seIhSzFxLkh0QqckuNSre4iGqSElZRUv1hVHH2YgrZ7xtQL9McwL8o1fh6HqkzykjUx0Iy2haVIUg=="; }; }; - "office-ui-fabric-react-7.174.0" = { + "office-ui-fabric-react-7.174.1" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.174.0"; + version = "7.174.1"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.174.0.tgz"; - sha512 = "hnuISSifwA7nSihuxpdNlh5plAmaPJqcDZUdhswak964Kb/8/ckMz/7BRQf+u9pGNs6LR14iDfRF/4RjLLzs6g=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.174.1.tgz"; + sha512 = "zRUpUqZtVncvb+Tt+5SVNEcI3MfpwTLU+v2u7ZdF9ukPbD+UBKJSkIbydyO0P2S5jVizgdqioSOarfUA70ICvw=="; }; }; "omggif-1.0.10" = { @@ -45320,6 +45617,15 @@ let sha512 = "oepllyG9gX1qH4Sm20YAKxg1GA7L7puhvGnTfimi31P07zSIj7SDV6YtuAx9nbJF51DES+2CIIRkXs8GKqWJxA=="; }; }; + "p-retry-4.6.1" = { + name = "p-retry"; + packageName = "p-retry"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-retry/-/p-retry-4.6.1.tgz"; + sha512 = "e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA=="; + }; + }; "p-some-4.1.0" = { name = "p-some"; packageName = "p-some"; @@ -46211,13 +46517,13 @@ let sha512 = "nxl9nrnLQmh64iTzMfyylSlRozL7kAXIaxw1fVcLYdyhNkJCRUzirRZTikXGJsg+hc4fqpneTK6iU2H1Q8THSA=="; }; }; - "patel-0.34.0" = { + "patel-0.35.1" = { name = "patel"; packageName = "patel"; - version = "0.34.0"; + version = "0.35.1"; src = fetchurl { - url = "https://registry.npmjs.org/patel/-/patel-0.34.0.tgz"; - sha512 = "3EvIzxbIFknpPa9QL2LYW+B35qFwER3Dn674KSC9Hc7DIuLJ7YMUJOR4dvCMPmpj/lB4fDvfr/VYV7FKKLEpFA=="; + url = "https://registry.npmjs.org/patel/-/patel-0.35.1.tgz"; + sha512 = "Em5Zh8t+oVnTNELwze1J9iQEeOBC+84B+UstU4hrmv16uvdunBzmMad6kY28nVxBxycqH6EYsDV2s1rO9IeZaw=="; }; }; "path-browserify-0.0.1" = { @@ -46454,13 +46760,13 @@ let sha512 = "Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ=="; }; }; - "patrisika-0.22.2" = { + "patrisika-0.23.0" = { name = "patrisika"; packageName = "patrisika"; - version = "0.22.2"; + version = "0.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/patrisika/-/patrisika-0.22.2.tgz"; - sha512 = "8L6zlp+F4InnoFv0jjGdar948yEzP30bE96f6RHnECaUsU9BWRiTBhkAuhIobG4Lrr8CBscUcar7UWe0Bm1lqA=="; + url = "https://registry.npmjs.org/patrisika/-/patrisika-0.23.0.tgz"; + sha512 = "bGxKK+XqO7Qfgv7WJSeytwZlbQsKXeuya+FD+6CB0iHat4tSbmN6eT0FEWGf0ulNguD0th/H3fa+VuXDDYQmLw=="; }; }; "patrisika-scopes-0.12.0" = { @@ -48219,15 +48525,6 @@ let sha512 = "zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw=="; }; }; - "pretty-format-24.9.0" = { - name = "pretty-format"; - packageName = "pretty-format"; - version = "24.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz"; - sha512 = "00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA=="; - }; - }; "pretty-format-25.5.0" = { name = "pretty-format"; packageName = "pretty-format"; @@ -48795,13 +49092,13 @@ let sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; - "proto3-json-serializer-0.1.1" = { + "proto3-json-serializer-0.1.3" = { name = "proto3-json-serializer"; packageName = "proto3-json-serializer"; - version = "0.1.1"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-0.1.1.tgz"; - sha512 = "Wucuvf7SqAw1wcai0zV+3jW3QZJiO/W9wZoJaTheebYdwfj2k9VfF3Gw9r2vGAaTeslhMbkVbojJG0+LjpgLxQ=="; + url = "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-0.1.3.tgz"; + sha512 = "X0DAtxCBsy1NDn84huVFGOFgBslT2gBmM+85nY6/5SOAaCon1jzVNdvi74foIyFvs5CjtSbQsepsM5TsyNhqQw=="; }; }; "protobufjs-3.8.2" = { @@ -50730,13 +51027,13 @@ let sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A=="; }; }; - "react-devtools-core-4.15.0" = { + "react-devtools-core-4.16.0" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.15.0"; + version = "4.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.15.0.tgz"; - sha512 = "Y1NwrWSKRg4TtwcES2upzXFDmccAW9jrGQG2D8EGQrZhK+0hmuhgFnSdKpFc3z04CSeDT5t83RMXcmX5TkR1dA=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.16.0.tgz"; + sha512 = "fqyVbp+wVVey6O4uVBk5s3J/vTiPludp7lulr6a8asTBm7DIA0vLBbjmAOLCnOlkWcgdy4mjsqOgNCbu8uICWw=="; }; }; "react-dom-16.14.0" = { @@ -51009,6 +51306,15 @@ let sha512 = "aLcPqxovhJTVJcsnROuuzQvv6oziQx4zd3JvG0vGCL5MjTONUc4uJ90zCBC6R7W7oUKBNoR/F8pkyfVwlbxqng=="; }; }; + "read-package-json-4.0.0" = { + name = "read-package-json"; + packageName = "read-package-json"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-4.0.0.tgz"; + sha512 = "EBQiek1udd0JKvUzaViAWHYVQRuQZ0IP0LWUOqVCJaZIX92ZO86dOpvsTOO3esRIQGgl7JhFBaGqW41VI57KvQ=="; + }; + }; "read-package-json-fast-2.0.3" = { name = "read-package-json-fast"; packageName = "read-package-json-fast"; @@ -53178,6 +53484,15 @@ let sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; }; }; + "retry-0.13.1" = { + name = "retry"; + packageName = "retry"; + version = "0.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz"; + sha512 = "XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="; + }; + }; "retry-0.6.0" = { name = "retry"; packageName = "retry"; @@ -53943,13 +54258,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.37.5" = { + "sass-1.38.0" = { name = "sass"; packageName = "sass"; - version = "1.37.5"; + version = "1.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.37.5.tgz"; - sha512 = "Cx3ewxz9QB/ErnVIiWg2cH0kiYZ0FPvheDTVC6BsiEGBTZKKZJ1Gq5Kq6jy3PKtL6+EJ8NIoaBW/RSd2R6cZOA=="; + url = "https://registry.npmjs.org/sass/-/sass-1.38.0.tgz"; + sha512 = "WBccZeMigAGKoI+NgD7Adh0ab1HUq+6BmyBUEaGxtErbUtWUevEbdgo5EZiJQofLUGcKtlNaO2IdN73AHEua5g=="; }; }; "sax-0.5.8" = { @@ -55455,6 +55770,15 @@ let sha512 = "FkMq+MQc5hzYgM86nLuHI98Acwi3p4wX+a5BO9Hhw4JdK4L7WueIiZ4tXEobImPqBz2sVcV0+Mu3GRB30IGang=="; }; }; + "smart-buffer-1.1.15" = { + name = "smart-buffer"; + packageName = "smart-buffer"; + version = "1.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz"; + sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"; + }; + }; "smart-buffer-4.2.0" = { name = "smart-buffer"; packageName = "smart-buffer"; @@ -55959,6 +56283,15 @@ let sha512 = "VnVAb663fosipI/m6pqRXakEOw7nvd7TUgdr3PlR/8V2I95QIdwT8L4nMxhyU8SmDBHYXU1TOElaKOmKLfYzeQ=="; }; }; + "socks-1.1.10" = { + name = "socks"; + packageName = "socks"; + version = "1.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz"; + sha1 = "5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"; + }; + }; "socks-2.6.1" = { name = "socks"; packageName = "socks"; @@ -55977,6 +56310,15 @@ let sha512 = "vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ=="; }; }; + "socks-proxy-agent-6.0.0" = { + name = "socks-proxy-agent"; + packageName = "socks-proxy-agent"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.0.0.tgz"; + sha512 = "FIgZbQWlnjVEQvMkylz64/rUggGtrKstPnx8OZyYFG0tAFR8CSBtpXxSwbFLHyeXFn/cunFL7MpuSOvDSOPo9g=="; + }; + }; "socks5-client-1.2.8" = { name = "socks5-client"; packageName = "socks5-client"; @@ -56805,13 +57147,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-2.1.5" = { + "ssb-db2-2.3.0" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "2.1.5"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.1.5.tgz"; - sha512 = "3Sbdf5AavoSqo7h1OQXSZ+RFIuTeu9CJpL2ojI8ySFZMZTsnPo7X7LQ1Bd4cNYTK7DBCvfjwvY01sO8VjFzlgw=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.3.0.tgz"; + sha512 = "D3LLv5Vp5NDYrFmszM0JQ5NwSoNNUBepDzedOULXvWZ6agcr8fRijiFrgMDGyexJN9WW9eTlJk+xN3sSiX6rag=="; }; }; "ssb-ebt-5.6.7" = { @@ -57066,6 +57408,24 @@ let sha512 = "nzj5EQnhm5fBGXgtzuuWgxv45dW+CJJm4eCLZKiOxyG1NE/WJZwju2DmqZfiE9zr9bC2T2hPHkckDP0CCP8v8w=="; }; }; + "ssb-validate2-0.1.1" = { + name = "ssb-validate2"; + packageName = "ssb-validate2"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-validate2/-/ssb-validate2-0.1.1.tgz"; + sha512 = "EG6CEgx7qX02Ekx8bhkEexs1foaMAt6BAmE91d3BRpim/+i+16jEYf9DzYcifKymxlsM9AUz2P0TyRxbMXreOQ=="; + }; + }; + "ssb-validate2-rsjs-node-1.0.0" = { + name = "ssb-validate2-rsjs-node"; + packageName = "ssb-validate2-rsjs-node"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-validate2-rsjs-node/-/ssb-validate2-rsjs-node-1.0.0.tgz"; + sha512 = "kg/4JNzXEgFCRkvbhAuYZwq14n2sgXF03hClL5Hc9XsMWlQeQ/UHUvClMvy2veFUivz7A6PGT8MaL5BDxW0LiQ=="; + }; + }; "ssb-ws-6.2.3" = { name = "ssb-ws"; packageName = "ssb-ws"; @@ -57075,13 +57435,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.47" = { + "sscaff-1.2.50" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.47"; + version = "1.2.50"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.47.tgz"; - sha512 = "0SSqDSLkF9sRHwO6g80D74S5iAqupqcG9EsHCv4BRvwlrqu2Jr3ury5PF0tyyA2wPZejwHZ+u5XgEo8GIVQ6rA=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.50.tgz"; + sha512 = "uEcxq341buXVnoWpzwHahKuTw4WkauXv+TFZMY2ljjlKQMRoaJm1rgsSFJEDe1w53pL+qgvFUziV/zKmbA1P5g=="; }; }; "ssh-config-1.1.6" = { @@ -57255,6 +57615,15 @@ let sha1 = "51f9c6a08c146473fcd021af551c9f32ed5c7b9d"; }; }; + "standard-as-callback-2.1.0" = { + name = "standard-as-callback"; + packageName = "standard-as-callback"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz"; + sha512 = "qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A=="; + }; + }; "standard-error-1.1.0" = { name = "standard-error"; packageName = "standard-error"; @@ -58110,6 +58479,15 @@ let sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; }; }; + "strip-ansi-7.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.0.tgz"; + sha512 = "UhDTSnGF1dc0DRbUqr1aXwNoY3RgVkSWG8BrpnuFIxhP57IqbS7IRta2Gfiavds4yCxc5+fEAVVOgBZWnYkvzg=="; + }; + }; "strip-ansi-control-characters-2.0.0" = { name = "strip-ansi-control-characters"; packageName = "strip-ansi-control-characters"; @@ -59254,13 +59632,13 @@ let sha512 = "FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA=="; }; }; - "tar-4.4.17" = { + "tar-4.4.19" = { name = "tar"; packageName = "tar"; - version = "4.4.17"; + version = "4.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.17.tgz"; - sha512 = "q7OwXq6NTdcYIa+k58nEMV3j1euhDhGCs/VRw9ymx/PbH0jtIM2+VTgDE/BW3rbLkrBUXs5fzEKgic5oUciu7g=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz"; + sha512 = "a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA=="; }; }; "tar-4.4.6" = { @@ -59281,6 +59659,15 @@ let sha512 = "0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg=="; }; }; + "tar-6.1.10" = { + name = "tar"; + packageName = "tar"; + version = "6.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-6.1.10.tgz"; + sha512 = "kvvfiVvjGMxeUNB6MyYv5z7vhfFRwbwCXJAeL0/lnbrttBVqcMOnpHUf0X42LrPMR8mMpgapkJMchFH4FSHzNA=="; + }; + }; "tar-6.1.2" = { name = "tar"; packageName = "tar"; @@ -59290,15 +59677,6 @@ let sha512 = "EwKEgqJ7nJoS+s8QfLYVGMDmAsj+StbI2AM/RTHeUSsOw6Z8bwNBRv5z3CY0m7laC5qUAqruLX5AhMuc5deY3Q=="; }; }; - "tar-6.1.8" = { - name = "tar"; - packageName = "tar"; - version = "6.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.8.tgz"; - sha512 = "sb9b0cp855NbkMJcskdSYA7b11Q8JsX4qe4pyUAfHp+Y6jBjJeek2ZVlwEfWayshEIwlIzXx0Fain3QG9JPm2A=="; - }; - }; "tar-fs-1.16.3" = { name = "tar-fs"; packageName = "tar-fs"; @@ -59488,6 +59866,15 @@ let sha512 = "HIeWmj77uOOHb0QX7siN3OtwV3CTntquin6TNVg6SHOqCP3hYKmox90eeFOGaY1MqJ9WYDDjkyZrW6qS5AWpbw=="; }; }; + "tempfile-3.0.0" = { + name = "tempfile"; + packageName = "tempfile"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tempfile/-/tempfile-3.0.0.tgz"; + sha512 = "uNFCg478XovRi85iD42egu+eSFUmmka750Jy7L5tfHI5hQKKtbPnxaSaXAbBqCDYrw3wx4tXjKwci4/QmsZJxw=="; + }; + }; "tempy-0.1.0" = { name = "tempy"; packageName = "tempy"; @@ -63476,6 +63863,15 @@ let sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; }; }; + "uws-9.148.0" = { + name = "uws"; + packageName = "uws"; + version = "9.148.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uws/-/uws-9.148.0.tgz"; + sha512 = "vWt+e8dOdwLM4neb1xIeZuQ7ZUN3l7n0qTKrOUtU1EZrV4BpmrSnsEL30d062/ocqRMGtLpwzVFsLKFgXomA9g=="; + }; + }; "v8-compile-cache-2.3.0" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; @@ -65114,6 +65510,15 @@ let sha512 = "rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w=="; }; }; + "wasm-feature-detect-1.2.11" = { + name = "wasm-feature-detect"; + packageName = "wasm-feature-detect"; + version = "1.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/wasm-feature-detect/-/wasm-feature-detect-1.2.11.tgz"; + sha512 = "HUqwaodrQGaZgz1lZaNioIkog9tkeEJjrM3eq4aUL04whXOVDRc/o2EGb/8kV0QX411iAYWEqq7fMBmJ6dKS6w=="; + }; + }; "watch-1.0.2" = { name = "watch"; packageName = "watch"; @@ -65231,6 +65636,15 @@ let sha512 = "tB0F+ccobsfw5jTWBinWJKyd/YdCdRbKj+CFSnsJeEgFYysOULvWFYyeCxn9KuQvG/3UF1t3cTAcJzBec5LCWA=="; }; }; + "web-streams-polyfill-3.1.0" = { + name = "web-streams-polyfill"; + packageName = "web-streams-polyfill"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.1.0.tgz"; + sha512 = "wO9r1YnYe7kFBLHyyVEhV1H8VRWoNiNnuP+v/HUUmSTaRF8F93Kmd3JMrETx0f11GXxRek6OcL2QtjFIdc5WYw=="; + }; + }; "web-tree-sitter-0.17.1" = { name = "web-tree-sitter"; packageName = "web-tree-sitter"; @@ -65348,13 +65762,13 @@ let sha512 = "68VT2ZgG9EHs6h6UxfV2SEYewA9BA3SOLSnC2NEbJJiEwbAiueDL033R1xX0jzjmXvMh0oSeKnKgbO2bDXIEyQ=="; }; }; - "webpack-5.50.0" = { + "webpack-5.51.1" = { name = "webpack"; packageName = "webpack"; - version = "5.50.0"; + version = "5.51.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.50.0.tgz"; - sha512 = "hqxI7t/KVygs0WRv/kTgUW8Kl3YC81uyWQSo/7WUs5LsuRw0htH/fCwbVBGCuiX/t4s7qzjXFcf41O8Reiypag=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.51.1.tgz"; + sha512 = "xsn3lwqEKoFvqn4JQggPSRxE4dhsRcysWTqYABAZlmavcoTmwlOb9b1N36Inbt/eIispSkuHa80/FJkDTPos1A=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -65402,6 +65816,15 @@ let sha512 = "djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ=="; }; }; + "webpack-dev-middleware-5.0.0" = { + name = "webpack-dev-middleware"; + packageName = "webpack-dev-middleware"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.0.0.tgz"; + sha512 = "9zng2Z60pm6A98YoRcA0wSxw1EYn7B7y5owX/Tckyt9KGyULTkLtiavjaXlWqOMkM0YtqGgL3PvMOFgyFLq8vw=="; + }; + }; "webpack-dev-server-3.11.0" = { name = "webpack-dev-server"; packageName = "webpack-dev-server"; @@ -65555,13 +65978,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-1.3.10" = { + "webtorrent-1.5.3" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.3.10"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.3.10.tgz"; - sha512 = "w0+y6YRyfdS37on5ialAyxpM8XzIB6nFWZOO1O9MgMzG8asLEa1uJ7aGfXoZ+030FCRj235eyhzlnTxYEWBvKg=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.5.3.tgz"; + sha512 = "iWPFQgfVPNzpl2d3Gf2H4oycO7d15sKIpx/6lnl27WshyHXgcEPAg+RqbVL0BdXEfbiKHSYM3XplCwYiaOMUBw=="; }; }; "well-known-symbols-2.0.0" = { @@ -66392,6 +66815,15 @@ let sha512 = "0UWlCD2s3RSclw8FN+D0zDTUyMO+1kHwJQQJzkgUh16S8d3NYON0AKCEQPffE0ez4JyRFu76QDA9KR5bOG/7jw=="; }; }; + "ws-8.2.0" = { + name = "ws"; + packageName = "ws"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-8.2.0.tgz"; + sha512 = "uYhVJ/m9oXwEI04iIVmgLmugh2qrZihkywG9y5FfZV2ATeLIzHf93qs+tUNqlttbQK957/VX3mtwAS+UfIwA4g=="; + }; + }; "x-default-browser-0.3.1" = { name = "x-default-browser"; packageName = "x-default-browser"; @@ -66473,13 +66905,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.0.53" = { + "xdl-59.0.54" = { name = "xdl"; packageName = "xdl"; - version = "59.0.53"; + version = "59.0.54"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.0.53.tgz"; - sha512 = "U98lIdfMfwwUTmXwsF5t9Pu/VJSe+Bxb/1v0HWq6UK1VoA13EE2cE5JRBGFmu0+mkrust/Mp6AN289VKpguilw=="; + url = "https://registry.npmjs.org/xdl/-/xdl-59.0.54.tgz"; + sha512 = "ucHQcVgjfzZwQqv1LavCWeubsLPtfmoTus9WpdX3/MzCvrMOt1EP7I8GQGmSOoidhpoFnV4Zqly5sMKppH5qlg=="; }; }; "xenvar-0.5.1" = { @@ -67615,22 +68047,22 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "12.2.1"; + version = "12.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-12.2.1.tgz"; - sha512 = "D0SMVRLEYOEJYaxWm4a5TjQzfQt4BI8R9Dz/Dk/FNFtiuFyaRgbrFgicLF8ePyHWzmHi+KN9i5bgBcWMEtY5SQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-12.2.2.tgz"; + sha512 = "pk+UR8m0paDb1FaED6122JpN3ky+g4c/ccJx7vHZXnXa0/H76cXNoifxkZiGySjxyQyQxUCOuQwgc2cCaX8OPQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1202.1" - sources."@angular-devkit/core-12.2.1" - sources."@angular-devkit/schematics-12.2.1" + sources."@angular-devkit/architect-0.1202.2" + sources."@angular-devkit/core-12.2.2" + sources."@angular-devkit/schematics-12.2.2" 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.1" + sources."@npmcli/run-script-1.8.6" + sources."@schematics/angular-12.2.2" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -67751,7 +68183,7 @@ in ]; }) sources."ip-1.1.5" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" @@ -67774,7 +68206,7 @@ in sources."log-symbols-4.1.0" sources."lru-cache-6.0.0" sources."magic-string-0.25.7" - sources."make-fetch-happen-9.0.4" + sources."make-fetch-happen-9.0.5" sources."mime-db-1.49.0" sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" @@ -67841,7 +68273,7 @@ in sources."signal-exit-3.0.3" sources."smart-buffer-4.2.0" sources."socks-2.6.1" - sources."socks-proxy-agent-5.0.1" + sources."socks-proxy-agent-6.0.0" sources."source-map-0.7.3" sources."sourcemap-codec-1.4.8" sources."sshpk-1.16.1" @@ -67851,7 +68283,7 @@ in sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" sources."symbol-observable-4.0.0" - sources."tar-6.1.8" + sources."tar-6.1.10" sources."through-2.3.8" sources."tmp-0.0.33" sources."tough-cookie-2.5.0" @@ -68245,10 +68677,10 @@ in "@bitwarden/cli" = nodeEnv.buildNodePackage { name = "_at_bitwarden_slash_cli"; packageName = "@bitwarden/cli"; - version = "1.17.1"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.17.1.tgz"; - sha512 = "OLzkh+ggrr95FL+pFxMmUdq8VMOz8aT50QZXqtyzvyhdhXDcdOCCrp3nd/j5yp4Y1hV0cElwOQUD/IEBmCwEPw=="; + url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.18.0.tgz"; + sha512 = "U3d1PHdlBE68r2t0p3GS+IA9BzrZXl7haTCiTwHBOoxKY5gL4Frm//duwCxfT1d8p9ucCiuAW6tDQsldSI5xhg=="; }; dependencies = [ sources."@tootallnate/once-1.1.2" @@ -68407,7 +68839,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.6.1" + sources."@types/node-16.6.2" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."ansi-colors-3.2.3" @@ -68602,7 +69034,7 @@ in sources."is-boolean-object-1.1.2" sources."is-buffer-2.0.5" sources."is-callable-1.2.4" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-date-object-1.0.5" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -68941,7 +69373,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.6.1" + sources."@types/node-16.6.2" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -68976,7 +69408,7 @@ in sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.7" + sources."browserslist-4.16.8" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" @@ -69007,7 +69439,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.806" + sources."electron-to-chromium-1.3.813" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -69065,7 +69497,7 @@ in sources."interpret-1.4.0" sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -69108,7 +69540,7 @@ in sources."mute-stream-0.0.8" sources."neo-async-2.6.2" sources."node-emoji-1.10.0" - sources."node-releases-1.1.74" + sources."node-releases-1.1.75" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" @@ -69235,6 +69667,63 @@ in bypassCache = true; reconstructLock = true; }; + "@squoosh/cli" = nodeEnv.buildNodePackage { + name = "_at_squoosh_slash_cli"; + packageName = "@squoosh/cli"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@squoosh/cli/-/cli-0.7.2.tgz"; + sha512 = "uMnUWMx4S8UApO/EfPyRyvUmw+0jI9wwAfdHfGjvVg4DAIvEgsA+VWK2KOBnJiChvVd768K27g09ESzptyX93w=="; + }; + dependencies = [ + sources."@squoosh/lib-0.4.0" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."base64-js-1.5.1" + sources."bl-4.1.0" + sources."buffer-5.7.1" + sources."chalk-4.1.2" + sources."cli-cursor-3.1.0" + sources."cli-spinners-2.6.0" + sources."clone-1.0.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."commander-7.2.0" + sources."defaults-1.0.3" + sources."has-flag-4.0.0" + sources."ieee754-1.2.1" + sources."inherits-2.0.4" + sources."is-interactive-1.0.0" + sources."is-unicode-supported-0.1.0" + sources."json5-2.2.0" + sources."kleur-4.1.4" + sources."log-symbols-4.1.0" + sources."mimic-fn-2.1.0" + sources."minimist-1.2.5" + sources."onetime-5.1.2" + sources."ora-5.4.1" + sources."readable-stream-3.6.0" + sources."restore-cursor-3.1.0" + sources."safe-buffer-5.2.1" + sources."signal-exit-3.0.3" + sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" + sources."util-deprecate-1.0.2" + sources."wasm-feature-detect-1.2.11" + sources."wcwidth-1.0.1" + sources."web-streams-polyfill-3.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A CLI for Squoosh"; + homepage = "https://github.com/GoogleChromeLabs/squoosh"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; @@ -69416,7 +69905,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.6.1" + sources."@types/node-16.6.2" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -69431,13 +69920,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.2" // { + (sources."@vue/compiler-core-3.2.4" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.2.2" - sources."@vue/shared-3.2.2" + sources."@vue/compiler-dom-3.2.4" + sources."@vue/shared-3.2.4" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -69497,7 +69986,7 @@ in sources."assign-symbols-1.0.0" sources."ast-types-0.13.3" sources."async-2.6.3" - sources."async-retry-1.3.1" + sources."async-retry-1.3.3" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -69539,7 +70028,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.16.7" + sources."browserslist-4.16.8" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -69616,12 +70105,12 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.16.1" // { + (sources."core-js-compat-3.16.2" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-js-pure-3.16.1" + sources."core-js-pure-3.16.2" sources."core-util-is-1.0.2" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -69687,7 +70176,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.806" + sources."electron-to-chromium-1.3.813" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -69749,7 +70238,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-2.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."fd-slicer-1.1.0" sources."figures-3.2.0" sources."file-type-8.1.0" @@ -69770,7 +70259,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.157.0" + sources."flow-parser-0.158.0" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -69883,7 +70372,7 @@ in sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" sources."is-callable-1.2.4" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" @@ -70023,7 +70512,7 @@ in sources."which-2.0.2" ]; }) - sources."node-releases-1.1.74" + sources."node-releases-1.1.75" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -70172,7 +70661,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."ret-0.1.15" - sources."retry-0.12.0" + sources."retry-0.13.1" sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."rss-parser-3.12.0" @@ -70699,7 +71188,7 @@ in sources."async-3.2.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.16.7" + sources."browserslist-4.16.8" sources."caniuse-lite-1.0.30001251" sources."chalk-2.4.2" sources."color-convert-1.9.3" @@ -70711,7 +71200,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.806" + sources."electron-to-chromium-1.3.813" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -70738,7 +71227,7 @@ in sources."homedir-polyfill-1.0.3" sources."ini-1.3.8" sources."is-3.3.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-windows-1.0.2" sources."isexe-2.0.0" (sources."jake-10.8.2" // { @@ -70757,7 +71246,7 @@ in sources."minimist-1.2.5" sources."moment-2.29.1" sources."ms-2.1.2" - sources."node-releases-1.1.74" + sources."node-releases-1.1.75" sources."node.extend-2.0.2" (sources."nomnom-1.8.1" // { dependencies = [ @@ -70805,7 +71294,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.6.1" + sources."@types/node-16.6.2" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -70839,13 +71328,13 @@ in sha512 = "L8AmtKzdiRyYg7BUXJTzigmhbQRCXFKz6SA1Lqo0+AR2FBbQ4aTAPFSDlOutnFkjhiz8my4agGXog1xlMjPJ6A=="; }; dependencies = [ - sources."browserslist-4.16.7" + sources."browserslist-4.16.8" sources."caniuse-lite-1.0.30001251" sources."colorette-1.3.0" - sources."electron-to-chromium-1.3.806" + sources."electron-to-chromium-1.3.813" sources."escalade-3.1.1" sources."fraction.js-4.1.1" - sources."node-releases-1.1.74" + sources."node-releases-1.1.75" sources."normalize-range-0.1.2" sources."postcss-value-parser-4.1.0" ]; @@ -70869,14 +71358,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.6.1" + sources."@types/node-16.6.2" 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.968.0" // { + (sources."aws-sdk-2.972.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -71080,10 +71569,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.7.8"; + version = "10.7.11"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.8.tgz"; - sha512 = "lBtaJP9EmDdvaYcsjvKhkS84sG79uZwhhoZ/Xb8Onj1FS8zwLPWFqzpRZ1SJ32COq9aJUWumLD+6LCnWH6Xbsg=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.11.tgz"; + sha512 = "BLJgmf7MthfG2rVS61rKIzm6jXNB8kPaNIOAGtvjKj1F/5HsD6Jr+NkvSCYerdjCEmmZwW9SR5YagGCb5i4FLA=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -71096,7 +71585,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-16.6.1" + sources."@types/node-16.6.2" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -71473,17 +71962,17 @@ in sources."ws-7.5.0" ]; }) - (sources."ln-service-52.0.0" // { + (sources."ln-service-52.0.1" // { dependencies = [ sources."@grpc/grpc-js-1.3.7" sources."@grpc/proto-loader-0.6.4" sources."@types/express-4.17.13" - sources."@types/node-16.6.0" + sources."@types/node-16.6.1" sources."@types/request-2.48.7" sources."@types/ws-7.4.7" sources."bn.js-5.2.0" sources."form-data-2.5.1" - sources."lightning-4.0.0" + sources."lightning-4.1.0" sources."ws-8.1.0" ]; }) @@ -71504,7 +71993,21 @@ in sources."nofilter-2.0.3" ]; }) - sources."ln-telegram-3.2.10" + (sources."ln-telegram-3.2.10" // { + dependencies = [ + sources."@grpc/grpc-js-1.3.7" + sources."@grpc/proto-loader-0.6.4" + sources."@types/express-4.17.13" + 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."form-data-2.5.1" + sources."lightning-4.0.0" + sources."ln-service-52.0.0" + sources."ws-8.1.0" + ]; + }) sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" @@ -71630,7 +72133,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.6.1" + sources."@types/node-16.6.2" ]; }) sources."proxy-addr-2.0.7" @@ -72184,7 +72687,7 @@ in sources."inherits-2.0.4" sources."intersect-1.0.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-finite-1.1.0" sources."is-plain-obj-1.1.0" sources."is-utf8-0.2.1" @@ -72388,7 +72891,7 @@ in sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" sources."is-callable-1.2.4" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-date-object-1.0.5" sources."is-generator-function-1.0.10" sources."is-negative-zero-2.0.1" @@ -72586,7 +73089,7 @@ in sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."charenc-0.0.2" - sources."chart.js-3.5.0" + sources."chart.js-3.5.1" sources."cipher-base-1.0.4" sources."cliui-5.0.0" sources."color-convert-1.9.3" @@ -72636,7 +73139,7 @@ in }) sources."decimal.js-10.3.1" sources."delayed-stream-1.0.0" - sources."denque-1.5.0" + sources."denque-1.5.1" sources."depd-1.1.2" sources."destroy-1.0.4" sources."dijkstrajs-1.0.2" @@ -72680,7 +73183,7 @@ in ]; }) sources."find-up-4.1.0" - sources."follow-redirects-1.14.1" + sources."follow-redirects-1.14.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.2.0" @@ -72719,7 +73222,7 @@ in sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-expression-4.0.0" sources."is-fullwidth-code-point-2.0.0" sources."is-plain-obj-1.1.0" @@ -72788,7 +73291,7 @@ in sources."nan-2.15.0" sources."ncp-2.0.0" sources."negotiator-0.6.2" - sources."normalize-package-data-3.0.2" + sources."normalize-package-data-3.0.3" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."on-finished-2.3.0" @@ -72978,7 +73481,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.6.1" + sources."@types/node-16.6.2" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -73120,7 +73623,7 @@ in sources."ip-set-1.0.2" sources."ipaddr.js-2.0.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-finite-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -73380,10 +73883,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.37"; + version = "1.0.0-beta.41"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.37.tgz"; - sha512 = "0xRmM6/5EwTbzpqinQujvrVZKJhTkLfD8hXEuSASNAv/5uKLRa5pfdOD53ALq7n0eVeOqZaGNtwKhGRcPuNDxw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.41.tgz"; + sha512 = "+j1dwqcDj+qwYLkzgJa6fFkvV4f/4z67ULg8yyu2CGhJewqbd1c4klFbzJnjvljbqV5/d/uI6lfcMTRHvnZtAQ=="; }; dependencies = [ sources."@jsii/check-node-1.33.0" @@ -73396,8 +73899,8 @@ in sources."call-bind-1.0.2" sources."camelcase-6.2.0" sources."case-1.6.3" - sources."cdk8s-1.0.0-beta.27" - sources."cdk8s-plus-17-1.0.0-beta.42" + sources."cdk8s-1.0.0-beta.30" + sources."cdk8s-plus-17-1.0.0-beta.52" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" @@ -73410,7 +73913,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-3.3.124" + sources."constructs-3.3.128" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -73486,13 +73989,13 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.326" // { + (sources."jsii-srcmak-0.1.329" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.296" + sources."json2jsii-0.2.1" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -73528,7 +74031,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.47" + sources."sscaff-1.2.50" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -73584,7 +74087,7 @@ in sha512 = "53HldFlYJdptaQ9yZyx8xuN0pxmBwI7yaVImmPwGmauoOYWsO89YrAjyPIiAaR+GWI8avbQeg3jz5Z1Q+MoIGA=="; }; dependencies = [ - sources."@apollo/client-3.4.7" + sources."@apollo/client-3.4.8" (sources."@apollo/protobufjs-1.2.2" // { dependencies = [ sources."@types/node-10.17.60" @@ -73630,14 +74133,14 @@ in sources."@graphql-tools/utils-8.0.2" ]; }) - (sources."@graphql-tools/mock-8.2.1" // { + (sources."@graphql-tools/mock-8.2.2" // { dependencies = [ sources."@graphql-tools/utils-8.1.1" ]; }) - (sources."@graphql-tools/schema-8.1.1" // { + (sources."@graphql-tools/schema-8.1.2" // { dependencies = [ - sources."@graphql-tools/merge-8.0.1" + sources."@graphql-tools/merge-8.0.2" sources."@graphql-tools/utils-8.1.1" ]; }) @@ -73673,7 +74176,7 @@ in sources."@types/express-serve-static-core-4.17.24" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/node-14.17.9" + sources."@types/node-14.17.10" sources."@types/node-fetch-2.5.12" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -73724,7 +74227,7 @@ in sources."array-union-2.1.0" sources."astral-regex-2.0.0" sources."async-3.2.1" - sources."async-retry-1.3.1" + sources."async-retry-1.3.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."auto-bind-4.0.0" @@ -73792,7 +74295,7 @@ in ]; }) sources."concat-map-0.0.1" - sources."constructs-3.3.124" + sources."constructs-3.3.128" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -73802,7 +74305,7 @@ in sources."convert-to-spaces-1.0.2" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-pure-3.16.1" + sources."core-js-pure-3.16.2" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."crc-32-1.2.0" @@ -73864,14 +74367,14 @@ in }) sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."fd-slicer-1.1.0" sources."figures-3.2.0" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" sources."find-up-4.1.0" sources."flatted-2.0.2" - sources."follow-redirects-1.14.1" + sources."follow-redirects-1.14.2" sources."foreach-2.0.5" sources."form-data-3.0.1" sources."forwarded-0.2.0" @@ -73992,7 +74495,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.326" // { + (sources."jsii-srcmak-0.1.329" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -74093,7 +74596,7 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."react-16.14.0" - sources."react-devtools-core-4.15.0" + sources."react-devtools-core-4.16.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" sources."readable-stream-3.6.0" @@ -74106,7 +74609,7 @@ in sources."reserved-words-0.1.2" sources."resolve-from-5.0.0" sources."restore-cursor-3.1.0" - sources."retry-0.12.0" + sources."retry-0.13.1" sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."run-async-2.4.1" @@ -74150,7 +74653,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.47" + sources."sscaff-1.2.50" (sources."stack-utils-2.0.3" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -74327,7 +74830,7 @@ in sources."hosted-git-info-2.8.9" sources."indent-string-3.2.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-docker-2.2.1" sources."is-plain-obj-1.1.0" sources."is-stream-1.1.0" @@ -74475,10 +74978,10 @@ in coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; - version = "0.13.0"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.13.0.tgz"; - sha512 = "8YsX+hE+PwJy+r8MiHK880KocpMTMAlhLjNfK9TjBNTG8a6+BPjb27FSjwzsa1h4vAw8IJz+PfH/0Jsz+VhJKg=="; + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.14.0.tgz"; + sha512 = "CxeuK0gr5GKnswwuTKgWmRm3/KEmzeH0T8sV1AIRYuB/vZ61kBMplgb9fRvrNI540pKDR2xqWs5XZk6NyitPgA=="; }; buildInputs = globalBuildInputs; meta = { @@ -74528,10 +75031,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.21.2"; + version = "0.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.21.2.tgz"; - sha512 = "KqwsIOrPFWgrNA16PAosZlpHLdfv9YpxcaKGcPBpCRFl+QZqOlrxlHnPLb+8jsLLrxo8QnROa+6RWoCUZWo9Rw=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.22.0.tgz"; + sha512 = "sLmbNULhxddBJK+X1e7UAWJjBrJYbFZf25J6kY1Eg9BIUUnSvh9pFBfUq8L7WXkSSnEB6lgGJVI49kHBOxNjsA=="; }; buildInputs = globalBuildInputs; meta = { @@ -74587,10 +75090,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.18.14"; + version = "0.18.15"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.14.tgz"; - sha512 = "nfJl0hw1/fMhXbaSNEVBHUQTUIGfiBRVQ5KLmYO4gJ7pNvhIcEUas+DKKONDr3WtmV3ZlEWmR0SbvVnaRzKB5w=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.15.tgz"; + sha512 = "YXwbqzvEKo2fT2srqhESG3KOzz1mZ8V4SY/T8fLo2yxY1C14m7Bol2rqP+7VI+tXwaKXWbnMoQRDgOTjgL2oxQ=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -74933,7 +75436,7 @@ in sources."fast-diff-1.2.0" sources."fb-watchman-2.0.1" sources."flatted-2.0.2" - sources."follow-redirects-1.14.1" + sources."follow-redirects-1.14.2" sources."fp-ts-2.11.1" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" @@ -75041,7 +75544,7 @@ in sources."string_decoder-1.1.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."tar-6.1.8" + sources."tar-6.1.10" sources."traverse-0.3.9" sources."tslib-2.3.1" sources."unbox-primitive-1.0.1" @@ -75241,7 +75744,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.16.1" + sources."core-js-3.16.2" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -75277,7 +75780,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.806" + sources."electron-to-chromium-1.3.813" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -75475,7 +75978,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-ci-1.2.1" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -76264,7 +76767,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@stylelint/postcss-css-in-js-0.37.2" sources."@stylelint/postcss-markdown-0.36.2" - sources."@types/mdast-3.0.7" + sources."@types/mdast-3.0.8" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" @@ -76284,7 +76787,7 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.16.7" + sources."browserslist-4.16.8" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" @@ -76326,7 +76829,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.806" + sources."electron-to-chromium-1.3.813" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -76338,7 +76841,7 @@ in sources."fast-diff-1.2.0" sources."fast-glob-3.2.7" sources."fastest-levenshtein-1.0.12" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -76378,7 +76881,7 @@ in sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-decimal-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -76423,8 +76926,8 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.74" - (sources."normalize-package-data-3.0.2" // { + sources."node-releases-1.1.75" + (sources."normalize-package-data-3.0.3" // { dependencies = [ sources."semver-7.3.5" ]; @@ -76635,7 +77138,7 @@ in sources."has-flag-3.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."minimatch-3.0.4" @@ -76700,10 +77203,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.8.5"; + version = "1.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.8.5.tgz"; - sha512 = "wFjtKm9KeXOpI/po5unbnju1H6/pm1wT3fHHfNo3LYF5PVKgz39Suvv09XCEAUSBC5PPu8wXNZLoBeVRMI4yuQ=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.8.6.tgz"; + sha512 = "RTet29nZNYrOWEuquBOAv3yFtWyHPE7xGbsHjRdNbTP6g9PF+2nV2TnDO+c/T5HAk/1J0lKKZBu6hZTnEJ2f4w=="; }; dependencies = [ sources."typescript-4.3.5" @@ -76821,7 +77324,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -77040,6 +77543,180 @@ in bypassCache = true; reconstructLock = true; }; + code-theme-converter = nodeEnv.buildNodePackage { + name = "code-theme-converter"; + packageName = "code-theme-converter"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/code-theme-converter/-/code-theme-converter-1.2.1.tgz"; + sha512 = "uPhR9IKtN1z6gt9mpRH5OAdYjJQgQq7CCQpm5VmCpLe2QdGDzi4xfB3ybXGaBRX+UN4whtz3pZvgZssJvBwcqQ=="; + }; + dependencies = [ + sources."@xstate/fsm-1.6.1" + sources."ansi-styles-3.2.1" + sources."balanced-match-1.0.2" + sources."base64-js-1.5.1" + sources."bl-1.2.3" + sources."brace-expansion-1.1.11" + sources."buffer-5.7.1" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-crc32-0.2.13" + sources."buffer-fill-1.0.0" + sources."capture-stack-trace-1.0.1" + sources."caw-2.0.1" + sources."chalk-2.4.2" + sources."cmd-shim-2.1.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."commander-5.1.0" + sources."concat-map-0.0.1" + sources."config-chain-1.1.13" + sources."core-util-is-1.0.2" + sources."create-error-class-3.0.2" + sources."cross-spawn-6.0.5" + sources."decompress-4.2.1" + sources."decompress-tar-4.1.1" + (sources."decompress-tarbz2-4.1.1" // { + dependencies = [ + sources."file-type-6.2.0" + ]; + }) + sources."decompress-targz-4.1.1" + (sources."decompress-unzip-4.0.1" // { + dependencies = [ + sources."file-type-3.9.0" + sources."get-stream-2.3.1" + ]; + }) + sources."download-5.0.3" + sources."download-git-repo-1.1.0" + sources."duplexer3-0.1.4" + sources."end-of-stream-1.4.4" + sources."escape-string-regexp-1.0.5" + (sources."execa-1.0.0" // { + dependencies = [ + sources."get-stream-4.1.0" + ]; + }) + sources."fd-slicer-1.1.0" + sources."file-type-5.2.0" + sources."filename-reserved-regex-2.0.0" + sources."filenamify-2.1.0" + sources."fs-constants-1.0.0" + sources."fs-extra-8.1.0" + sources."fs.realpath-1.0.0" + sources."get-proxy-2.1.0" + sources."get-stream-3.0.0" + sources."git-clone-0.1.0" + sources."glob-7.1.7" + sources."got-6.7.1" + sources."graceful-fs-4.2.8" + sources."has-flag-3.0.0" + sources."has-symbol-support-x-1.4.2" + sources."has-to-string-tag-x-1.4.1" + sources."ieee754-1.2.1" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.8" + sources."is-natural-number-4.0.1" + sources."is-object-1.0.2" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.2.0" + sources."is-stream-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isurl-1.0.0" + sources."js2xmlparser-4.0.1" + sources."json5-2.2.0" + sources."jsonfile-4.0.0" + sources."lowercase-keys-1.0.1" + (sources."make-dir-1.3.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" + sources."nice-try-1.0.5" + (sources."npm-conf-1.1.3" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."npm-run-path-2.0.2" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."p-finally-1.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."pend-1.2.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."plist-3.0.3" + sources."prepend-http-1.0.4" + sources."process-nextick-args-2.0.1" + sources."proto-list-1.2.4" + sources."pump-3.0.0" + sources."ramda-0.27.1" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."rimraf-2.7.1" + sources."safe-buffer-5.2.1" + (sources."seek-bzip-1.0.6" // { + dependencies = [ + sources."commander-2.20.3" + ]; + }) + sources."semver-5.7.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.3" + sources."slash-2.0.0" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."strip-dirs-2.1.0" + sources."strip-eof-1.0.0" + sources."strip-outer-1.0.1" + sources."supports-color-5.5.0" + sources."tar-stream-1.6.2" + sources."through-2.3.8" + sources."timed-out-4.0.1" + sources."to-buffer-1.1.1" + sources."trim-repeated-1.0.0" + sources."tunnel-agent-0.6.0" + sources."unbzip2-stream-1.4.3" + sources."universalify-0.1.2" + sources."unzip-response-2.0.1" + sources."url-parse-lax-1.0.0" + sources."url-to-options-1.0.1" + sources."util-deprecate-1.0.2" + sources."uuid-3.4.0" + sources."which-1.3.1" + sources."wrappy-1.0.2" + sources."xmlbuilder-9.0.7" + sources."xmlcreate-2.0.3" + sources."xmldom-0.6.0" + sources."xtend-4.0.2" + sources."yauzl-2.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Convert any vscode theme with ease!"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; @@ -77079,7 +77756,7 @@ in sources."colors-1.4.0" sources."commander-2.20.3" sources."escape-string-regexp-1.0.5" - sources."follow-redirects-1.14.1" + sources."follow-redirects-1.14.2" sources."has-flag-3.0.0" sources."is-fullwidth-code-point-2.0.0" sources."log-symbols-2.2.0" @@ -77128,7 +77805,7 @@ in sources."fast-safe-stringify-2.0.8" sources."fecha-4.2.1" sources."fn.name-1.1.0" - sources."follow-redirects-1.14.1" + sources."follow-redirects-1.14.2" sources."http-proxy-1.18.1" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" @@ -77170,6 +77847,227 @@ in bypassCache = true; reconstructLock = true; }; + conventional-changelog-cli = nodeEnv.buildNodePackage { + name = "conventional-changelog-cli"; + packageName = "conventional-changelog-cli"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-2.1.1.tgz"; + sha512 = "xMGQdKJ+4XFDDgfX5aK7UNFduvJMbvF5BB+g0OdVhA3rYdYyhctrIE2Al+WYdZeKTdg9YzMWF2iFPT8MupIwng=="; + }; + dependencies = [ + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/highlight-7.14.5" + sources."@hutson/parse-repository-url-3.0.2" + sources."@types/minimist-1.2.2" + sources."@types/normalize-package-data-2.4.1" + sources."JSONStream-1.3.5" + sources."add-stream-1.0.0" + sources."ansi-styles-3.2.1" + sources."array-ify-1.0.0" + sources."arrify-1.0.1" + sources."camelcase-5.3.1" + sources."camelcase-keys-6.2.2" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."compare-func-2.0.0" + sources."conventional-changelog-3.1.24" + sources."conventional-changelog-angular-5.0.12" + sources."conventional-changelog-atom-2.0.8" + sources."conventional-changelog-codemirror-2.0.8" + sources."conventional-changelog-conventionalcommits-4.6.0" + sources."conventional-changelog-core-4.2.3" + sources."conventional-changelog-ember-2.0.9" + sources."conventional-changelog-eslint-3.0.9" + sources."conventional-changelog-express-2.0.6" + sources."conventional-changelog-jquery-3.0.11" + sources."conventional-changelog-jshint-2.0.9" + sources."conventional-changelog-preset-loader-2.3.4" + sources."conventional-changelog-writer-5.0.0" + sources."conventional-commits-filter-2.0.7" + sources."conventional-commits-parser-3.2.1" + sources."core-util-is-1.0.2" + sources."dargs-7.0.0" + sources."dateformat-3.0.3" + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."dot-prop-5.3.0" + sources."error-ex-1.3.2" + sources."escape-string-regexp-1.0.5" + sources."find-up-4.1.0" + sources."function-bind-1.1.1" + (sources."get-pkg-repo-4.1.2" // { + dependencies = [ + sources."meow-7.1.1" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."hosted-git-info-2.8.9" + ]; + }) + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."type-fest-0.6.0" + ]; + }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."semver-5.7.1" + sources."string_decoder-1.1.1" + sources."through2-2.0.5" + ]; + }) + sources."git-raw-commits-2.0.10" + sources."git-remote-origin-url-2.0.0" + sources."git-semver-tags-4.1.1" + sources."gitconfiglocal-1.0.0" + sources."graceful-fs-4.2.8" + sources."handlebars-4.7.7" + sources."hard-rejection-2.1.0" + sources."has-1.0.3" + sources."has-flag-3.0.0" + sources."hosted-git-info-4.0.2" + sources."indent-string-4.0.0" + sources."inherits-2.0.4" + sources."ini-1.3.8" + sources."is-arrayish-0.2.1" + sources."is-core-module-2.6.0" + sources."is-obj-2.0.0" + sources."is-plain-obj-1.1.0" + sources."is-text-path-1.0.1" + sources."isarray-1.0.0" + sources."js-tokens-4.0.0" + sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsonparse-1.3.1" + sources."kind-of-6.0.3" + sources."lines-and-columns-1.1.6" + (sources."load-json-file-4.0.0" // { + dependencies = [ + sources."parse-json-4.0.0" + sources."pify-3.0.0" + ]; + }) + sources."locate-path-5.0.0" + sources."lodash-4.17.21" + sources."lodash.ismatch-4.4.0" + sources."lru-cache-6.0.0" + sources."map-obj-4.2.1" + (sources."meow-8.1.2" // { + dependencies = [ + sources."hosted-git-info-2.8.9" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."normalize-package-data-2.5.0" + sources."type-fest-0.6.0" + ]; + }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) + sources."semver-5.7.1" + sources."type-fest-0.18.1" + sources."yargs-parser-20.2.9" + ]; + }) + sources."min-indent-1.0.1" + sources."minimist-1.2.5" + sources."minimist-options-4.1.0" + sources."modify-values-1.0.1" + sources."neo-async-2.6.2" + (sources."normalize-package-data-3.0.3" // { + dependencies = [ + sources."semver-7.3.5" + ]; + }) + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."parse-json-5.2.0" + sources."path-exists-4.0.0" + sources."path-parse-1.0.7" + (sources."path-type-3.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."pify-2.3.0" + sources."process-nextick-args-2.0.1" + sources."q-1.5.1" + sources."quick-lru-4.0.1" + (sources."read-pkg-3.0.0" // { + dependencies = [ + sources."hosted-git-info-2.8.9" + sources."normalize-package-data-2.5.0" + sources."semver-5.7.1" + ]; + }) + (sources."read-pkg-up-3.0.0" // { + 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."path-exists-3.0.0" + ]; + }) + sources."readable-stream-3.6.0" + sources."redent-3.0.0" + sources."resolve-1.20.0" + sources."safe-buffer-5.2.1" + sources."semver-6.3.0" + sources."source-map-0.6.1" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.10" + sources."split-1.0.1" + sources."split2-3.2.2" + sources."string_decoder-1.3.0" + sources."strip-bom-3.0.0" + sources."strip-indent-3.0.0" + sources."supports-color-5.5.0" + sources."temp-dir-2.0.0" + sources."tempfile-3.0.0" + sources."text-extensions-1.9.0" + sources."through-2.3.8" + sources."through2-4.0.2" + sources."trim-newlines-3.0.1" + sources."trim-off-newlines-1.0.1" + sources."type-fest-0.13.1" + sources."uglify-js-3.14.1" + sources."util-deprecate-1.0.2" + sources."uuid-3.4.0" + sources."validate-npm-package-license-3.0.4" + sources."wordwrap-1.0.0" + sources."xtend-4.0.2" + sources."yallist-4.0.0" + sources."yargs-parser-18.1.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Generate a changelog from git metadata"; + homepage = "https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; cordova = nodeEnv.buildNodePackage { name = "cordova"; packageName = "cordova"; @@ -77188,7 +78086,7 @@ in 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."@npmcli/run-script-1.8.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" @@ -77368,7 +78266,7 @@ in sources."fast-glob-3.2.7" sources."fast-json-parse-1.0.3" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."figures-2.0.0" sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { @@ -77473,7 +78371,7 @@ in sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-ci-2.0.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" @@ -77519,7 +78417,7 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-9.0.4" + sources."make-fetch-happen-9.0.5" sources."md5-file-5.0.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -77684,7 +78582,7 @@ in sources."slash-3.0.0" sources."smart-buffer-4.2.0" sources."socks-2.6.1" - sources."socks-proxy-agent-5.0.1" + sources."socks-proxy-agent-6.0.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -77702,7 +78600,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."systeminformation-4.34.23" - sources."tar-6.1.8" + sources."tar-6.1.10" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" @@ -77793,7 +78691,7 @@ in sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.6.1" + sources."@types/node-16.6.2" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -77933,7 +78831,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -78164,7 +79062,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.6.1" + sources."@types/node-16.6.2" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -79254,9 +80152,10 @@ in sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" - sources."@blueprintjs/core-3.47.0" - sources."@blueprintjs/icons-3.27.0" - sources."@electron/get-1.12.4" + sources."@blueprintjs/colors-1.0.0" + sources."@blueprintjs/core-3.48.0" + sources."@blueprintjs/icons-3.28.0" + sources."@electron/get-1.13.0" sources."@hypnosphi/create-react-context-0.3.1" sources."@mapbox/extent-0.4.0" sources."@mapbox/geojson-coords-0.0.1" @@ -79279,12 +80178,12 @@ in sources."@types/fs-extra-8.1.2" sources."@types/geojson-7946.0.8" sources."@types/mapbox-gl-0.54.5" - sources."@types/mime-types-2.1.0" - sources."@types/node-14.17.9" + sources."@types/mime-types-2.1.1" + sources."@types/node-14.17.10" 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.13" + sources."@types/rc-1.2.0" + sources."@types/react-16.14.14" sources."@types/react-dom-16.9.14" sources."@types/react-virtualized-9.21.13" sources."@types/scheduler-0.16.2" @@ -79320,13 +80219,13 @@ in }) sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - sources."boolean-3.1.2" + sources."boolean-3.1.4" (sources."braces-2.3.2" // { dependencies = [ sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.16.7" + sources."browserslist-4.16.8" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."cache-base-1.0.1" @@ -79380,8 +80279,8 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.16.1" - (sources."core-js-compat-3.16.1" // { + sources."core-js-3.16.2" + (sources."core-js-compat-3.16.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -79406,8 +80305,8 @@ in sources."dom4-2.1.6" sources."duplexer3-0.1.4" sources."earcut-2.2.3" - sources."electron-13.1.9" - sources."electron-to-chromium-1.3.806" + sources."electron-13.2.1" + sources."electron-to-chromium-1.3.813" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -79519,7 +80418,7 @@ in sources."is-arguments-1.1.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" @@ -79585,7 +80484,7 @@ in sources."napi-macros-2.0.0" sources."node-fetch-2.6.1" sources."node-gyp-build-4.2.3" - sources."node-releases-1.1.74" + sources."node-releases-1.1.75" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."normalize.css-8.0.1" @@ -79686,7 +80585,7 @@ in sources."rw-0.1.4" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" - (sources."sass-1.37.5" // { + (sources."sass-1.38.0" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -79861,10 +80760,10 @@ in diagnostic-languageserver = nodeEnv.buildNodePackage { name = "diagnostic-languageserver"; packageName = "diagnostic-languageserver"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.12.0.tgz"; - sha512 = "oXWAYO2ACrjFRYPTqUOQz3gCE7U1R5HVkuiqXXTFCcujiAprJjzvV5VAjrJolgA7guyRrXE5HliuDGoWJfWHOw=="; + url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.13.0.tgz"; + sha512 = "ye07E+B6IpwUx3eBvZ9Ug0dVloNDzefTWlxkYnP+kB2nB17tjU07wiWzy2FamWIXIlL6THBtY74ZmvoVQ3Bn7w=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -79882,7 +80781,7 @@ in sources."del-6.0.0" sources."dir-glob-3.0.1" sources."fast-glob-3.2.7" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."fs.realpath-1.0.0" @@ -79995,7 +80894,7 @@ in dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.17.9" + sources."@types/node-14.17.10" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -80157,7 +81056,7 @@ in sources."@electron-forge/template-typescript-6.0.0-beta.59" sources."@electron-forge/template-typescript-webpack-6.0.0-beta.59" sources."@electron-forge/template-webpack-6.0.0-beta.59" - (sources."@electron/get-1.12.4" // { + (sources."@electron/get-1.13.0" // { dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" @@ -80194,7 +81093,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.6.1" + sources."@types/node-16.6.2" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -80232,7 +81131,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."bl-4.1.0" sources."bluebird-3.7.2" - sources."boolean-3.1.2" + sources."boolean-3.1.4" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-5.7.1" @@ -80271,7 +81170,7 @@ in sources."concat-map-0.0.1" sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" - sources."core-js-3.16.1" + sources."core-js-3.16.2" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" (sources."cross-spawn-windows-exe-1.2.0" // { @@ -80355,7 +81254,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."fd-slicer-1.1.0" sources."figures-3.2.0" sources."filename-reserved-regex-2.0.0" @@ -80444,7 +81343,7 @@ in ]; }) sources."is-arrayish-0.2.1" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-finite-1.1.0" @@ -80545,7 +81444,7 @@ in (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."semver-5.7.1" - sources."tar-4.4.17" + sources."tar-4.4.19" ]; }) sources."nopt-4.0.3" @@ -80692,7 +81591,7 @@ in sources."sudo-prompt-9.2.1" sources."sumchecker-3.0.1" sources."supports-color-7.2.0" - (sources."tar-6.1.8" // { + (sources."tar-6.1.10" // { dependencies = [ sources."chownr-2.0.0" sources."fs-minipass-2.1.0" @@ -80847,7 +81746,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.6.1" + sources."@types/node-16.6.2" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -80866,7 +81765,7 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.16.7" + sources."browserslist-4.16.8" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.2" // { dependencies = [ @@ -80919,7 +81818,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.806" + sources."electron-to-chromium-1.3.813" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -80972,7 +81871,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-obj-2.0.0" @@ -81016,7 +81915,7 @@ in sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."nice-try-1.0.5" - sources."node-releases-1.1.74" + sources."node-releases-1.1.75" sources."normalize-package-data-2.5.0" sources."normalize-url-6.1.0" sources."npm-run-path-2.0.2" @@ -81053,7 +81952,7 @@ in sources."punycode-2.1.1" sources."quick-lru-5.1.1" sources."react-16.14.0" - sources."react-devtools-core-4.15.0" + sources."react-devtools-core-4.16.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" (sources."read-pkg-5.2.0" // { @@ -81173,7 +82072,7 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.174.0" + sources."@fluentui/react-7.174.1" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" @@ -81187,7 +82086,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.202" + sources."@microsoft/load-themed-styles-1.10.203" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -81429,7 +82328,7 @@ in sources."minizlib-2.1.2" sources."p-map-4.0.0" sources."rimraf-3.0.2" - sources."tar-6.1.8" + sources."tar-6.1.10" ]; }) sources."cache-base-1.0.1" @@ -81723,7 +82622,7 @@ in sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-1.1.4" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."figgy-pudding-3.5.2" sources."figures-2.0.0" sources."file-uri-to-path-1.0.0" @@ -81917,7 +82816,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-dir-1.0.0" @@ -82214,7 +83113,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.174.0" + sources."office-ui-fabric-react-7.174.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -82441,7 +83340,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."sass-1.37.5" // { + (sources."sass-1.38.0" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -82620,7 +83519,7 @@ in sources."swagger-ui-dist-3.34.0" sources."tail-2.2.3" sources."tapable-1.1.3" - (sources."tar-4.4.17" // { + (sources."tar-4.4.19" // { dependencies = [ sources."mkdirp-0.5.5" sources."safe-buffer-5.2.1" @@ -83201,10 +84100,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.10.0"; + version = "4.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.10.0.tgz"; - sha512 = "NHQQBPygck2bQUo5nvCB52BHa+JsjxSlXvdQ39lvonJwvbOdn7IACxlqrkmaxvjfopCLBiBADj3yk1uSYh2cnQ=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.10.1.tgz"; + sha512 = "jo0wFTBIal3AtClvjYRnLbipzwnjhjC2FrErZFigRzYCd7jhh2BAvOapiaPIgcSxWvL+BKKBbNFKLRB7O4UabA=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -83221,7 +84120,7 @@ in sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" (sources."@babel/helper-compilation-targets-7.15.0" // { dependencies = [ - sources."browserslist-4.16.7" + sources."browserslist-4.16.8" sources."semver-6.3.0" ]; }) @@ -83315,16 +84214,17 @@ in ]; }) sources."@babel/types-7.15.0" + sources."@dabh/diagnostics-2.0.2" sources."@expo/apple-utils-0.0.0-alpha.20" sources."@expo/bunyan-4.0.0" - sources."@expo/config-5.0.7" - (sources."@expo/config-plugins-3.0.7" // { + sources."@expo/config-5.0.8" + (sources."@expo/config-plugins-3.0.8" // { dependencies = [ sources."semver-7.3.5" ]; }) sources."@expo/config-types-42.0.0" - (sources."@expo/dev-server-0.1.82" // { + (sources."@expo/dev-server-0.1.83" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -83341,7 +84241,7 @@ in sources."temp-dir-2.0.0" ]; }) - sources."@expo/dev-tools-0.13.113" + sources."@expo/dev-tools-0.13.114" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -83356,9 +84256,9 @@ in ]; }) sources."@expo/json-file-8.2.33" - sources."@expo/metro-config-0.1.82" + sources."@expo/metro-config-0.1.83" sources."@expo/osascript-2.0.30" - (sources."@expo/package-manager-0.0.46" // { + (sources."@expo/package-manager-0.0.47" // { dependencies = [ sources."npm-package-arg-7.0.0" sources."rimraf-3.0.2" @@ -83371,8 +84271,13 @@ in sources."xmldom-0.5.0" ]; }) - sources."@expo/prebuild-config-2.0.7" + sources."@expo/prebuild-config-2.0.8" sources."@expo/results-1.0.0" + (sources."@expo/rudder-sdk-node-1.0.7" // { + dependencies = [ + sources."uuid-3.4.0" + ]; + }) (sources."@expo/schemer-1.3.31" // { dependencies = [ sources."ajv-5.5.2" @@ -83382,7 +84287,7 @@ in }) sources."@expo/sdk-runtime-versions-1.0.0" sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.14.0" // { + (sources."@expo/webpack-config-0.14.1" // { dependencies = [ (sources."@babel/core-7.9.0" // { dependencies = [ @@ -83419,7 +84324,7 @@ in }) sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.5" + sources."@npmcli/run-script-1.8.6" sources."@react-native-community/cli-debugger-ui-5.0.1" (sources."@react-native-community/cli-server-api-5.0.1" // { dependencies = [ @@ -83567,12 +84472,18 @@ in }) sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-1.5.2" + sources."async-3.2.1" sources."async-each-1.0.3" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" + (sources."auto-changelog-1.16.4" // { + dependencies = [ + sources."commander-5.1.0" + sources."semver-6.3.0" + ]; + }) sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."axios-0.21.1" @@ -83650,6 +84561,12 @@ in sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."builtins-1.0.3" + (sources."bull-3.29.0" // { + dependencies = [ + sources."get-port-5.1.1" + sources."p-timeout-3.2.0" + ]; + }) sources."bytes-3.0.0" (sources."cacache-15.2.0" // { dependencies = [ @@ -83737,6 +84654,7 @@ in }) sources."clone-1.0.4" sources."clone-response-1.0.2" + sources."cluster-key-slot-1.1.0" sources."co-4.6.0" (sources."coa-2.0.2" // { dependencies = [ @@ -83745,12 +84663,13 @@ in }) sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" - sources."color-3.2.1" + sources."color-3.0.0" 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."colorspace-1.1.2" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" sources."commander-2.17.1" @@ -83803,11 +84722,13 @@ in }) sources."pkg-dir-4.2.0" sources."semver-6.3.0" + sources."serialize-javascript-4.0.0" ]; }) - (sources."core-js-compat-3.16.1" // { + sources."core-js-3.16.2" + (sources."core-js-compat-3.16.2" // { dependencies = [ - sources."browserslist-4.16.7" + sources."browserslist-4.16.8" sources."semver-7.0.0" ]; }) @@ -83820,6 +84741,7 @@ in }) sources."create-hash-1.2.0" sources."create-hmac-1.1.7" + sources."cron-parser-2.18.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -83868,6 +84790,7 @@ in sources."dashdash-1.14.1" sources."dateformat-3.0.3" sources."debug-4.3.2" + sources."debuglog-1.0.1" sources."decache-4.4.0" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -83892,6 +84815,7 @@ in }) sources."delayed-stream-1.0.0" sources."delegates-1.0.0" + sources."denque-1.5.1" sources."depd-1.1.2" sources."deprecated-decorator-0.1.6" sources."des.js-1.0.1" @@ -83938,7 +84862,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.806" + sources."electron-to-chromium-1.3.813" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -83946,6 +84870,7 @@ in }) sources."emoji-regex-7.0.3" sources."emojis-list-3.0.0" + sources."enabled-2.0.0" sources."encodeurl-1.0.2" (sources."encoding-0.1.13" // { dependencies = [ @@ -83965,7 +84890,11 @@ in sources."eol-0.9.1" sources."err-code-2.0.3" sources."errno-0.1.8" - sources."error-ex-1.3.2" + (sources."error-ex-1.3.2" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) sources."errorhandler-1.5.1" sources."es-abstract-1.18.5" sources."es-to-primitive-1.2.1" @@ -84012,7 +84941,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.92" // { + (sources."expo-pwa-0.0.93" // { dependencies = [ sources."commander-2.20.0" ]; @@ -84039,8 +84968,10 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.11.1" + sources."fast-safe-stringify-2.0.8" + sources."fastq-1.12.0" sources."faye-websocket-0.10.0" + sources."fecha-4.2.1" sources."figgy-pudding-3.5.2" sources."figures-3.2.0" sources."file-loader-6.0.0" @@ -84057,7 +84988,9 @@ in sources."find-up-5.0.0" sources."find-yarn-workspace-root-2.0.0" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.14.1" + sources."fn.name-1.1.0" + sources."follow-redirects-1.14.2" + sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" (sources."fork-ts-checker-webpack-plugin-4.1.6" // { @@ -84131,6 +85064,11 @@ in }) sources."gzip-size-5.1.1" sources."handle-thing-2.0.1" + (sources."handlebars-4.7.7" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -84150,7 +85088,11 @@ in sources."kind-of-4.0.0" ]; }) - sources."hasbin-1.2.3" + (sources."hasbin-1.2.3" // { + dependencies = [ + sources."async-1.5.2" + ]; + }) (sources."hash-base-3.1.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -84176,6 +85118,7 @@ in (sources."html-webpack-plugin-4.3.0" // { dependencies = [ sources."loader-utils-1.4.0" + sources."util.promisify-1.0.0" ]; }) sources."htmlparser2-4.1.0" @@ -84231,20 +85174,25 @@ in sources."internal-ip-4.3.0" sources."internal-slot-1.0.3" sources."invariant-2.2.4" + (sources."ioredis-4.27.8" // { + dependencies = [ + sources."p-map-2.1.0" + ]; + }) sources."ip-1.1.5" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-absolute-url-2.1.0" sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.1" - sources."is-arrayish-0.2.1" + sources."is-arrayish-0.3.2" 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" sources."is-callable-1.2.4" sources."is-color-stop-1.1.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" @@ -84261,6 +85209,7 @@ in ]; }) sources."is-lambda-1.0.1" + sources."is-nan-1.3.2" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" sources."is-number-object-1.0.6" @@ -84357,6 +85306,7 @@ in sources."killable-1.0.1" sources."kind-of-6.0.3" sources."kleur-3.0.3" + sources."kuler-2.0.0" sources."last-call-webpack-plugin-3.0.0" sources."latest-version-5.1.0" sources."leven-3.1.0" @@ -84371,15 +85321,20 @@ in sources."lodash-4.17.21" sources."lodash.assign-4.2.0" sources."lodash.debounce-4.0.8" + sources."lodash.defaults-4.2.0" + sources."lodash.flatten-4.4.0" + sources."lodash.isarguments-3.1.0" sources."lodash.isobject-3.0.2" sources."lodash.isstring-4.0.1" sources."lodash.memoize-4.1.2" sources."lodash.uniq-4.5.0" + sources."lodash.uniqby-4.7.0" (sources."log-symbols-2.2.0" // { dependencies = [ sources."chalk-2.4.2" ]; }) + sources."logform-2.2.0" sources."loglevel-1.7.1" sources."loose-envify-1.4.0" (sources."lower-case-2.0.2" // { @@ -84394,7 +85349,7 @@ in sources."semver-5.7.1" ]; }) - (sources."make-fetch-happen-9.0.4" // { + (sources."make-fetch-happen-9.0.5" // { dependencies = [ sources."minipass-3.1.3" ]; @@ -84487,6 +85442,8 @@ in ]; }) sources."mkdirp-0.5.5" + sources."moment-2.29.1" + sources."moment-timezone-0.5.33" (sources."move-concurrently-1.0.1" // { dependencies = [ sources."rimraf-2.7.1" @@ -84530,7 +85487,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.74" + sources."node-releases-1.1.75" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" @@ -84592,6 +85549,7 @@ in sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" + sources."one-time-1.0.0" sources."onetime-2.0.1" sources."open-7.4.2" (sources."opn-5.5.0" // { @@ -84666,6 +85624,7 @@ in ]; }) sources."parse-asn1-5.1.6" + sources."parse-github-url-1.0.2" sources."parse-json-4.0.0" sources."parse-png-2.1.0" sources."parse-srcset-1.0.2" @@ -84864,6 +85823,7 @@ in sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" + sources."promise.prototype.finally-3.1.2" sources."prompts-2.4.1" sources."proxy-addr-2.0.7" sources."prr-1.0.1" @@ -84927,6 +85887,9 @@ in sources."readable-stream-2.3.7" sources."readdirp-3.6.0" sources."recursive-readdir-2.2.2" + sources."redis-commands-1.7.0" + sources."redis-errors-1.2.0" + sources."redis-parser-3.0.0" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.9" @@ -85015,7 +85978,7 @@ in sources."type-fest-0.12.0" ]; }) - sources."serialize-javascript-4.0.0" + sources."serialize-javascript-5.0.1" (sources."serve-index-1.9.1" // { dependencies = [ sources."debug-2.6.9" @@ -85038,11 +86001,7 @@ in sources."side-channel-1.0.4" sources."signal-exit-3.0.3" sources."simple-plist-1.1.1" - (sources."simple-swizzle-0.2.2" // { - dependencies = [ - sources."is-arrayish-0.3.2" - ]; - }) + sources."simple-swizzle-0.2.2" sources."sisteransi-1.0.5" sources."slash-3.0.0" sources."slugify-1.6.0" @@ -85089,7 +86048,7 @@ in ]; }) sources."socks-2.6.1" - sources."socks-proxy-agent-5.0.1" + sources."socks-proxy-agent-6.0.0" sources."source-list-map-2.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" @@ -85112,6 +86071,7 @@ in }) sources."stable-0.1.8" sources."stack-trace-0.0.10" + sources."standard-as-callback-2.1.0" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -85187,11 +86147,12 @@ in sources."domelementtype-1.3.1" sources."domutils-1.7.0" sources."nth-check-1.0.2" + sources."util.promisify-1.0.1" ]; }) sources."symbol-observable-1.2.0" sources."tapable-1.1.3" - (sources."tar-6.1.8" // { + (sources."tar-6.1.10" // { dependencies = [ sources."minipass-3.1.3" sources."mkdirp-1.0.4" @@ -85227,9 +86188,11 @@ in }) sources."pkg-dir-4.2.0" sources."semver-6.3.0" + sources."serialize-javascript-4.0.0" sources."source-map-0.6.1" ]; }) + sources."text-hex-1.0.0" sources."text-table-0.2.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" @@ -85254,6 +86217,7 @@ in sources."tough-cookie-2.5.0" sources."traverse-0.6.6" sources."tree-kill-1.2.2" + sources."triple-beam-1.3.0" sources."ts-interface-checker-0.1.13" sources."ts-invariant-0.4.4" sources."ts-pnp-1.2.0" @@ -85265,6 +86229,7 @@ in sources."type-fest-0.3.1" sources."type-is-1.6.18" sources."typedarray-0.0.6" + sources."uglify-js-3.14.1" sources."ultron-1.1.1" sources."unbox-primitive-1.0.1" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -85319,7 +86284,7 @@ in ]; }) sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.0" + sources."util.promisify-1.1.1" sources."utila-0.4.0" sources."utils-merge-1.0.1" sources."uuid-8.3.2" @@ -85368,6 +86333,7 @@ in sources."micromatch-3.1.10" sources."rimraf-2.7.1" sources."schema-utils-1.0.0" + sources."serialize-javascript-4.0.0" sources."source-map-0.6.1" sources."ssri-6.0.2" sources."terser-webpack-plugin-1.4.5" @@ -85491,7 +86457,14 @@ in ]; }) sources."widest-line-3.1.0" + (sources."winston-3.3.3" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."winston-transport-4.4.0" sources."with-open-file-0.1.7" + sources."wordwrap-1.0.0" sources."worker-farm-1.7.0" sources."worker-rpc-0.1.1" (sources."wrap-ansi-7.0.0" // { @@ -85509,8 +86482,9 @@ in sources."uuid-7.0.3" ]; }) - (sources."xdl-59.0.53" // { + (sources."xdl-59.0.54" // { dependencies = [ + sources."bplist-parser-0.3.0" sources."chownr-1.1.4" sources."fs-minipass-1.2.7" sources."minipass-2.9.0" @@ -85602,7 +86576,7 @@ in sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" sources."@types/minimist-1.2.2" - sources."@types/node-16.6.1" + sources."@types/node-16.6.2" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -85621,7 +86595,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."browserslist-4.16.7" + sources."browserslist-4.16.8" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."caller-callsite-2.0.0" @@ -85654,7 +86628,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.806" + sources."electron-to-chromium-1.3.813" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -85694,7 +86668,7 @@ in sources."ink-spinner-4.0.2" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."js-tokens-4.0.0" @@ -85722,8 +86696,8 @@ in sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."node-fetch-2.6.1" - sources."node-releases-1.1.74" - (sources."normalize-package-data-3.0.2" // { + sources."node-releases-1.1.75" + (sources."normalize-package-data-3.0.3" // { dependencies = [ sources."semver-7.3.5" ]; @@ -85748,7 +86722,7 @@ in sources."puppeteer-9.1.1" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.15.0" + sources."react-devtools-core-4.16.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" (sources."read-pkg-5.2.0" // { @@ -85869,7 +86843,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.30" // { + (sources."@oclif/core-0.5.31" // { dependencies = [ sources."chalk-4.1.2" (sources."cli-ux-5.6.3" // { @@ -86108,7 +87082,7 @@ in sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.11.1" + sources."fastq-1.12.0" (sources."faunadb-4.3.0" // { dependencies = [ sources."chalk-4.1.2" @@ -86531,9 +87505,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.3" // { + (sources."@google-cloud/pubsub-2.16.6" // { dependencies = [ - sources."google-auth-library-7.6.1" + sources."google-auth-library-7.6.2" ]; }) sources."@grpc/grpc-js-1.3.7" @@ -86565,7 +87539,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.6.1" + sources."@types/node-16.6.2" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -86655,7 +87629,7 @@ in (sources."cacache-15.2.0" // { dependencies = [ sources."mkdirp-1.0.4" - sources."tar-6.1.8" + sources."tar-6.1.10" ]; }) (sources."cacheable-request-6.1.0" // { @@ -86914,9 +87888,9 @@ in sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.24.0" // { + (sources."google-gax-2.24.2" // { dependencies = [ - sources."google-auth-library-7.6.1" + sources."google-auth-library-7.6.2" ]; }) sources."google-p12-pem-3.1.2" @@ -87123,7 +88097,7 @@ in dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.5" - sources."tar-6.1.8" + sources."tar-6.1.10" sources."which-2.0.2" ]; }) @@ -87180,7 +88154,7 @@ in sources."promise-breaker-5.0.0" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."proto3-json-serializer-0.1.1" + sources."proto3-json-serializer-0.1.3" sources."protobufjs-6.11.2" sources."proxy-addr-2.0.7" (sources."proxy-agent-4.0.1" // { @@ -87304,7 +88278,7 @@ in sources."has-flag-2.0.0" ]; }) - (sources."tar-4.4.17" // { + (sources."tar-4.4.19" // { dependencies = [ sources."chownr-1.1.4" sources."fs-minipass-1.2.7" @@ -87549,7 +88523,7 @@ in sources."inquirer-7.3.3" sources."inquirer-autocomplete-prompt-1.4.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."is-stream-2.0.1" @@ -87576,7 +88550,7 @@ in ]; }) sources."mute-stream-0.0.8" - sources."normalize-package-data-3.0.2" + sources."normalize-package-data-3.0.3" sources."npm-run-path-4.0.1" sources."num-sort-2.1.0" sources."once-1.4.0" @@ -87671,7 +88645,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.6.1" + sources."@types/node-16.6.2" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -87766,7 +88740,7 @@ in sources."jsprim-1.4.1" sources."jwt-decode-2.2.0" sources."lie-3.1.1" - sources."localforage-1.9.0" + sources."localforage-1.10.0" sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."mime-db-1.49.0" @@ -88356,10 +89330,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "3.11.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.11.0.tgz"; - sha512 = "jrC1VqQHCR4N++if2bZm+iVUpdCazfZgVK0FPnmTb6Uq3xqEqS5agZR9HeE/FV8ebQ1h6/4MfFt9XsSG4Z6TFw=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.12.0.tgz"; + sha512 = "Yf2Xa1mLbRi0yjtIRwklRCuTJB+DEKx5jl/2jFKKZkAdIHU8mXizBEkh4Pf0zeERv/22OjsfeCixjBcAw7WbHA=="; }; dependencies = [ (sources."@ardatan/aggregate-error-0.0.6" // { @@ -88448,13 +89422,13 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@tokenizer/token-0.3.0" sources."@turist/fetch-7.1.7" - sources."@turist/time-0.0.1" + sources."@turist/time-0.0.2" sources."@types/common-tags-1.8.1" sources."@types/istanbul-lib-coverage-2.0.3" 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.6.1" + sources."@types/node-16.6.2" sources."@types/node-fetch-2.5.12" sources."@types/unist-2.0.6" sources."@types/yargs-15.0.14" @@ -88509,7 +89483,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.7" + sources."browserslist-4.16.8" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -88571,7 +89545,7 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.31.0" + sources."contentful-management-7.32.0" sources."contentful-sdk-core-6.8.0" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.8.0" // { @@ -88582,7 +89556,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."cors-2.8.5" - sources."create-gatsby-1.11.0" + sources."create-gatsby-1.12.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -88617,7 +89591,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.806" + sources."electron-to-chromium-1.3.813" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -88679,7 +89653,7 @@ in ]; }) sources."find-up-4.1.0" - sources."follow-redirects-1.14.1" + sources."follow-redirects-1.14.2" sources."form-data-3.0.1" sources."forwarded-0.2.0" sources."fresh-0.5.2" @@ -88688,13 +89662,13 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."gatsby-core-utils-2.11.0" - (sources."gatsby-recipes-0.22.0" // { + sources."gatsby-core-utils-2.12.0" + (sources."gatsby-recipes-0.23.0" // { dependencies = [ sources."strip-ansi-6.0.0" ]; }) - sources."gatsby-telemetry-2.11.0" + sources."gatsby-telemetry-2.12.0" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" @@ -88746,7 +89720,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-decimal-1.0.4" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" @@ -88853,8 +89827,8 @@ in sources."no-case-3.0.4" sources."node-eta-0.9.0" sources."node-fetch-2.6.1" - sources."node-object-hash-2.3.8" - sources."node-releases-1.1.74" + sources."node-object-hash-2.3.9" + sources."node-releases-1.1.75" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" sources."npm-run-path-2.0.2" @@ -89186,7 +90160,7 @@ in sources."inherits-2.0.4" sources."interpret-1.4.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-fullwidth-code-point-2.0.0" sources."is-plain-object-5.0.0" sources."is-stream-2.0.1" @@ -89722,7 +90696,7 @@ in sources."ip-1.1.5" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-fullwidth-code-point-3.0.0" sources."is-installed-globally-0.4.0" sources."is-interactive-1.0.0" @@ -89777,7 +90751,7 @@ in sources."mute-stream-0.0.8" sources."netmask-2.0.2" sources."node-fetch-2.6.1" - sources."normalize-package-data-3.0.2" + sources."normalize-package-data-3.0.3" sources."normalize-url-4.5.1" sources."npm-run-path-4.0.1" sources."once-1.4.0" @@ -89940,7 +90914,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@exodus/schemasafe-1.0.0-rc.3" + sources."@exodus/schemasafe-1.0.0-rc.4" sources."@graphql-cli/common-4.1.0" sources."@graphql-cli/init-4.1.0" (sources."@graphql-tools/batch-execute-7.1.2" // { @@ -89997,9 +90971,9 @@ in sources."tslib-2.3.1" ]; }) - (sources."@graphql-tools/schema-8.1.1" // { + (sources."@graphql-tools/schema-8.1.2" // { dependencies = [ - sources."@graphql-tools/merge-8.0.1" + sources."@graphql-tools/merge-8.0.2" sources."@graphql-tools/utils-8.1.1" sources."tslib-2.3.1" ]; @@ -90031,7 +91005,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.6.1" + sources."@types/node-16.6.2" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -90147,7 +91121,7 @@ in sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.8" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."figlet-1.5.0" sources."figures-3.2.0" sources."fill-range-7.0.1" @@ -90520,7 +91494,7 @@ in sources."ini-1.3.8" sources."interpret-1.1.0" sources."is-absolute-1.0.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" @@ -91015,7 +91989,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -91417,7 +92391,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -91783,10 +92757,10 @@ in http-server = nodeEnv.buildNodePackage { name = "http-server"; packageName = "http-server"; - version = "13.0.0"; + version = "13.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-server/-/http-server-13.0.0.tgz"; - sha512 = "tqOx2M1CiZ3aVaE7Ue/0lup9kOG+Zqg6wdT1HygvxFnvPpU9doBMPcQ1ffT0/QS3J9ua35gipg0o3Dr8N0K0Tg=="; + url = "https://registry.npmjs.org/http-server/-/http-server-13.0.1.tgz"; + sha512 = "ke9rphoNuqsOCHy4tA3b3W4Yuxy7VUIXcTHSLz6bkMDAJPQD4twjEatquelJBIPwNhZuC3+FYj/+dSaGHdKTCw=="; }; dependencies = [ sources."async-2.6.3" @@ -91796,7 +92770,7 @@ in sources."corser-2.0.1" sources."debug-3.2.7" sources."eventemitter3-4.0.7" - sources."follow-redirects-1.14.1" + sources."follow-redirects-1.14.2" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" @@ -92665,7 +93639,7 @@ in ]; }) sources."supports-color-7.2.0" - sources."tar-4.4.17" + sources."tar-4.4.19" sources."through-2.3.8" sources."through2-3.0.2" sources."tmp-0.0.33" @@ -92706,14 +93680,14 @@ in bypassCache = true; reconstructLock = true; }; - "iosevka-https://github.com/be5invis/Iosevka/archive/v7.2.4.tar.gz" = nodeEnv.buildNodePackage { + "iosevka-https://github.com/be5invis/Iosevka/archive/v10.0.0.tar.gz" = nodeEnv.buildNodePackage { name = "iosevka"; packageName = "iosevka"; - version = "7.2.4"; + version = "10.0.0"; src = fetchurl { - name = "iosevka-7.2.4.tar.gz"; - url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/v7.2.4"; - sha256 = "c4c77a6beead2f164494fca061ba04e7f306771d0a7b86687ffa63fe43f7b83d"; + name = "iosevka-10.0.0.tar.gz"; + url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/v10.0.0"; + sha256 = "20d351190be5f0bb68bd458ce549c1ed34e923e1e7718d8f3f129e3fc84ab5b9"; }; dependencies = [ sources."@iarna/toml-2.2.5" @@ -92762,6 +93736,7 @@ in sources."@ot-builder/var-store-1.1.0" sources."@ot-builder/variance-1.1.0" sources."@unicode/unicode-13.0.0-1.2.0" + sources."@xmldom/xmldom-0.7.2" sources."aglfn-1.0.2" sources."amdefine-1.0.1" sources."ansi-regex-5.0.0" @@ -92773,7 +93748,7 @@ in sources."brace-expansion-1.1.11" sources."chainsaw-0.0.9" sources."chalk-2.4.2" - sources."cldr-6.1.1" + sources."cldr-7.1.1" sources."cli-cursor-3.1.0" sources."clipper-lib-6.4.2" sources."cliui-7.0.4" @@ -92845,9 +93820,9 @@ in sources."ot-builder-1.1.0" sources."otb-ttc-bundle-1.1.0" sources."passerror-1.1.1" - sources."patel-0.34.0" + sources."patel-0.35.1" sources."path-is-absolute-1.0.1" - sources."patrisika-0.22.2" + sources."patrisika-0.23.0" sources."patrisika-scopes-0.12.0" sources."pegjs-0.10.0" sources."prelude-ls-1.1.2" @@ -92910,7 +93885,6 @@ in ]; }) sources."wrappy-1.0.2" - sources."xmldom-0.6.0" sources."xpath-0.0.32" sources."y18n-5.0.8" sources."yallist-4.0.0" @@ -93152,7 +94126,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.30" // { + (sources."@oclif/core-0.5.31" // { dependencies = [ sources."ansi-regex-5.0.0" sources."debug-4.3.2" @@ -93246,7 +94220,7 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" - (sources."aws-sdk-2.968.0" // { + (sources."aws-sdk-2.973.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -93281,7 +94255,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.16.7" + sources."browserslist-4.16.8" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."builtin-modules-3.2.0" @@ -93471,7 +94445,7 @@ in ]; }) sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.806" + sources."electron-to-chromium-1.3.813" sources."emoji-regex-8.0.0" (sources."emphasize-1.5.0" // { dependencies = [ @@ -93543,7 +94517,7 @@ in sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."fault-1.0.4" (sources."figures-3.2.0" // { dependencies = [ @@ -93555,8 +94529,8 @@ in sources."fill-range-7.0.1" sources."find-cache-dir-2.1.0" sources."find-up-2.1.0" - sources."flow-parser-0.157.0" - sources."follow-redirects-1.14.1" + sources."flow-parser-0.158.0" + sources."follow-redirects-1.14.2" sources."font-awesome-filetypes-2.1.0" sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" @@ -93892,7 +94866,7 @@ in sources."semver-5.7.1" ]; }) - sources."node-releases-1.1.74" + sources."node-releases-1.1.75" sources."nopt-4.0.3" sources."normalize-path-3.0.0" sources."npm-bundled-1.1.2" @@ -94191,7 +95165,7 @@ in sources."symbol-observable-1.2.0" sources."symbol-tree-3.2.4" sources."table-layout-0.4.5" - (sources."tar-4.4.17" // { + (sources."tar-4.4.19" // { dependencies = [ sources."yallist-3.1.1" ]; @@ -95058,7 +96032,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -95447,7 +96421,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.30" // { + (sources."@oclif/core-0.5.31" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -95549,7 +96523,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.11.1" + sources."fastq-1.12.0" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" @@ -95557,7 +96531,7 @@ in }) sources."fill-range-7.0.1" sources."find-up-3.0.0" - sources."follow-redirects-1.14.1" + sources."follow-redirects-1.14.2" sources."form-data-3.0.1" sources."fs-extra-8.1.0" sources."function-bind-1.1.1" @@ -95715,7 +96689,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.6.1" + sources."@types/node-16.7.0" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -95763,7 +96737,7 @@ in sources."fill-range-7.0.1" sources."finalhandler-1.1.2" sources."flatted-2.0.2" - sources."follow-redirects-1.14.1" + sources."follow-redirects-1.14.2" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -96002,7 +96976,7 @@ in sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" sources."is-callable-1.2.4" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-date-object-1.0.5" sources."is-fullwidth-code-point-3.0.0" sources."is-generator-function-1.0.10" @@ -96801,12 +97775,13 @@ in dependencies = [ sources."make-fetch-happen-8.0.14" sources."npm-registry-fetch-9.0.0" + sources."socks-proxy-agent-5.0.1" ]; }) sources."@lerna/npm-install-4.0.0" (sources."@lerna/npm-publish-4.0.0" // { dependencies = [ - sources."normalize-package-data-3.0.2" + sources."normalize-package-data-3.0.3" sources."pify-5.0.0" sources."read-package-json-3.0.1" ]; @@ -96825,6 +97800,7 @@ in dependencies = [ sources."make-fetch-happen-8.0.14" sources."npm-registry-fetch-9.0.0" + sources."socks-proxy-agent-5.0.1" ]; }) sources."@lerna/pulse-till-done-4.0.0" @@ -96853,7 +97829,7 @@ in 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."@npmcli/run-script-1.8.6" sources."@octokit/auth-token-2.4.5" sources."@octokit/core-3.5.1" (sources."@octokit/endpoint-6.0.12" // { @@ -96961,7 +97937,7 @@ in sources."conventional-changelog-angular-5.0.12" (sources."conventional-changelog-core-4.2.3" // { dependencies = [ - sources."normalize-package-data-3.0.2" + sources."normalize-package-data-3.0.3" ]; }) sources."conventional-changelog-preset-loader-2.3.4" @@ -97023,7 +97999,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."figures-3.2.0" sources."fill-range-7.0.1" sources."filter-obj-1.1.0" @@ -97117,10 +98093,10 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - (sources."init-package-json-2.0.3" // { + (sources."init-package-json-2.0.4" // { dependencies = [ - sources."normalize-package-data-3.0.2" - sources."read-package-json-3.0.1" + sources."normalize-package-data-3.0.3" + sources."read-package-json-4.0.0" ]; }) (sources."inquirer-7.3.3" // { @@ -97136,7 +98112,7 @@ in sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" sources."is-ci-2.0.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-date-object-1.0.5" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -97173,7 +98149,7 @@ in sources."libnpmaccess-4.0.3" (sources."libnpmpublish-4.0.2" // { dependencies = [ - sources."normalize-package-data-3.0.2" + sources."normalize-package-data-3.0.3" ]; }) sources."lines-and-columns-1.1.6" @@ -97194,12 +98170,12 @@ in sources."semver-5.7.1" ]; }) - sources."make-fetch-happen-9.0.4" + sources."make-fetch-happen-9.0.5" sources."map-obj-4.2.1" (sources."meow-8.1.2" // { dependencies = [ sources."hosted-git-info-2.8.9" - sources."normalize-package-data-3.0.2" + sources."normalize-package-data-3.0.3" (sources."read-pkg-5.2.0" // { dependencies = [ sources."normalize-package-data-2.5.0" @@ -97269,7 +98245,7 @@ in sources."resolve-from-4.0.0" sources."rimraf-2.7.1" sources."semver-5.7.1" - sources."tar-4.4.17" + sources."tar-4.4.19" sources."which-1.3.1" sources."yallist-3.1.1" ]; @@ -97387,7 +98363,7 @@ in sources."slide-1.1.6" sources."smart-buffer-4.2.0" sources."socks-2.6.1" - sources."socks-proxy-agent-5.0.1" + sources."socks-proxy-agent-6.0.0" sources."sort-keys-2.0.0" sources."source-map-0.6.1" sources."spdx-correct-3.1.1" @@ -97415,7 +98391,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.8" + sources."tar-6.1.10" sources."temp-dir-1.0.0" (sources."temp-write-4.0.0" // { dependencies = [ @@ -98532,7 +99508,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.6.1" + sources."@types/node-16.7.0" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -98591,7 +99567,7 @@ in sources."assign-symbols-1.0.0" sources."async-3.2.1" sources."async-each-1.0.3" - sources."async-retry-1.3.1" + sources."async-retry-1.3.3" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -98689,7 +99665,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.16.7" + sources."browserslist-4.16.8" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.2" @@ -98777,7 +99753,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.16.1" // { + (sources."core-js-compat-3.16.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -98829,7 +99805,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.806" + sources."electron-to-chromium-1.3.813" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -99004,7 +99980,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" sources."is-ci-2.0.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-data-descriptor-1.0.0" sources."is-deflate-1.0.0" sources."is-descriptor-1.0.2" @@ -99132,7 +100108,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.74" + sources."node-releases-1.1.75" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -99257,7 +100233,7 @@ in sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" - sources."retry-0.12.0" + sources."retry-0.13.1" sources."rimraf-2.7.1" sources."ripemd160-2.0.2" sources."rollup-1.32.1" @@ -99866,7 +100842,7 @@ in sources."inherits-2.0.4" sources."inquirer-0.12.0" sources."interpret-1.4.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.5" @@ -100144,7 +101120,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.30" // { + (sources."@oclif/core-0.5.31" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -100170,7 +101146,7 @@ in 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.6.1" + sources."@types/node-16.7.0" sources."@types/parse-json-4.0.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" @@ -100205,7 +101181,7 @@ in sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.7" + sources."browserslist-4.16.8" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" @@ -100317,7 +101293,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.806" + sources."electron-to-chromium-1.3.813" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -100360,7 +101336,7 @@ in sources."extract-zip-2.0.1" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."fd-slicer-1.1.0" (sources."figures-3.2.0" // { dependencies = [ @@ -100378,7 +101354,7 @@ in ]; }) sources."find-up-4.1.0" - sources."flow-parser-0.157.0" + sources."flow-parser-0.158.0" sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."fs-constants-1.0.0" @@ -100509,7 +101485,7 @@ in sources."node-dir-0.1.17" sources."node-fetch-2.6.1" sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.74" + sources."node-releases-1.1.75" (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" @@ -100724,29 +101700,32 @@ in mirakurun = nodeEnv.buildNodePackage { name = "mirakurun"; packageName = "mirakurun"; - version = "3.8.0"; + version = "3.9.0-beta.1"; src = fetchurl { - url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.8.0.tgz"; - sha512 = "uEJ8S5nMNq6MvtxnWso6jLkwfA62RVa0+E3+TbBTOthPeC0FagskjcA6KZb2xNuEkMFoeZUQcAZcMIY5mKkHgQ=="; + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.9.0-beta.1.tgz"; + sha512 = "DYnXCxE2YDCsxUMDwmY817Tg5eLd2ANJotI/SeAZaNknY64zp5sHbWBndEJob2WXSNphOvn+Aki8aBxMwjQ1oA=="; }; dependencies = [ sources."@fluentui/date-time-utilities-8.2.2" sources."@fluentui/dom-utilities-2.1.4" - sources."@fluentui/font-icons-mdl2-8.1.8" - sources."@fluentui/foundation-legacy-8.1.8" + sources."@fluentui/font-icons-mdl2-8.1.9" + sources."@fluentui/foundation-legacy-8.1.9" sources."@fluentui/keyboard-key-0.3.4" sources."@fluentui/merge-styles-8.1.4" sources."@fluentui/react-8.27.0" - sources."@fluentui/react-focus-8.1.10" - sources."@fluentui/react-hooks-8.2.6" + sources."@fluentui/react-focus-8.1.11" + sources."@fluentui/react-hooks-8.2.7" sources."@fluentui/react-window-provider-2.1.4" sources."@fluentui/set-version-8.1.4" - 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.202" + sources."@fluentui/style-utilities-8.3.0" + sources."@fluentui/theme-2.2.2" + sources."@fluentui/utilities-8.3.0" + sources."@microsoft/load-themed-styles-1.10.203" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" + sources."@types/node-16.7.0" + sources."@types/uuid-3.4.10" + sources."@types/ws-6.0.4" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ansi-escapes-1.4.0" @@ -100755,12 +101734,14 @@ in sources."argparse-1.0.10" sources."aribts-1.3.5" sources."array-flatten-1.1.1" + sources."async-limiter-1.0.1" sources."babel-polyfill-6.23.0" (sources."babel-runtime-6.26.0" // { dependencies = [ sources."regenerator-runtime-0.11.1" ]; }) + sources."backo2-1.0.2" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."basic-auth-2.0.1" @@ -100768,6 +101749,7 @@ in sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."buffer-from-1.1.2" + sources."bufferutil-4.0.3" sources."builtin-status-codes-3.0.0" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { @@ -100845,6 +101827,7 @@ in sources."is-dir-1.0.0" sources."is-fullwidth-code-point-2.0.0" sources."is-stream-1.1.0" + sources."isomorphic-ws-4.0.1" sources."js-tokens-4.0.0" (sources."js-yaml-4.1.0" // { dependencies = [ @@ -100853,6 +101836,11 @@ in }) sources."json-buffer-3.0.0" sources."json-schema-traverse-0.4.1" + (sources."jsonrpc2-ws-1.0.0-beta9" // { + dependencies = [ + sources."eventemitter3-3.1.2" + ]; + }) sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."lodash-4.17.21" @@ -100879,6 +101867,7 @@ in sources."mute-stream-0.0.7" sources."negotiator-0.6.2" sources."node-fetch-1.6.3" + sources."node-gyp-build-4.2.3" sources."normalize-url-4.5.1" sources."object-assign-4.1.1" sources."on-finished-2.3.0" @@ -100963,6 +101952,7 @@ in sources."registry-url-5.1.0" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" + sources."rfdc-1.3.0" sources."run-async-2.4.1" sources."rx-4.1.0" sources."safe-buffer-5.1.2" @@ -101014,10 +102004,14 @@ in sources."unpipe-1.0.0" sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" + sources."utf-8-validate-5.0.5" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" + sources."uuid-3.4.0" + sources."uws-9.148.0" sources."vary-1.1.2" sources."wrappy-1.0.2" + sources."ws-6.2.2" sources."xtend-4.0.2" sources."yallist-4.0.0" ]; @@ -101034,10 +102028,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "9.0.3"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.0.3.tgz"; - sha512 = "hnYFrSefHxYS2XFGtN01x8un0EwNu2bzKvhpRFhgoybIvMaOkkL60IVPmkb5h6XDmUl4IMSB+rT5cIO4/4bJgg=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.1.0.tgz"; + sha512 = "Kjg/XxYOFFUi0h/FwMOeb6RoroiZ+P1yOfya6NK7h3dNhahrJx1r2XIT3ge4ZQvJM86mdjNA+W5phqRQh7DwCg=="; }; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" @@ -101364,10 +102358,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "6.4.2"; + version = "6.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.4.2.tgz"; - sha512 = "3w4D4AG3j0+diPu284sWPenkyTIjZ/j0M3DQ+MU6Vp3298fV/yncpC0taAPk/7NxqAH90Z+iWpdvoO9IUahzzA=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.7.1.tgz"; + sha512 = "+PkGIfVEATLs0FTkp1sIanyizH0AOJckhlMTA342YtXPmAVbwGINQ7eV0SU2i6VfNesu9It7JEjSq3SuAkF9gg=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -101500,36 +102494,27 @@ in sources."@bugsnag/node-7.11.0" sources."@bugsnag/safe-json-stringify-6.0.0" sources."@dabh/diagnostics-2.0.2" - sources."@jest/types-24.9.0" + sources."@jest/types-26.6.2" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-18.2.9" // { + (sources."@netlify/build-18.4.2" // { dependencies = [ - sources."is-plain-obj-2.1.0" - (sources."locate-path-5.0.0" // { - dependencies = [ - sources."p-locate-4.1.0" - ]; - }) sources."resolve-2.0.0-next.3" ]; }) - (sources."@netlify/cache-utils-2.0.1" // { + (sources."@netlify/cache-utils-2.0.3" // { 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-15.3.3" // { + (sources."@netlify/config-15.4.1" // { dependencies = [ sources."dot-prop-5.3.0" - sources."is-plain-obj-2.1.0" ]; }) sources."@netlify/esbuild-0.13.6" - sources."@netlify/framework-info-5.8.0" + sources."@netlify/framework-info-5.9.1" sources."@netlify/functions-utils-2.0.2" (sources."@netlify/git-utils-2.0.1" // { dependencies = [ @@ -101556,18 +102541,17 @@ in sources."@netlify/open-api-2.5.0" (sources."@netlify/plugin-edge-handlers-1.11.22" // { dependencies = [ - sources."@types/node-14.17.9" + sources."@types/node-14.17.10" ]; }) sources."@netlify/plugins-list-3.3.0" sources."@netlify/routing-local-proxy-0.31.0" sources."@netlify/run-utils-2.0.1" - (sources."@netlify/zip-it-and-ship-it-4.17.0" // { + (sources."@netlify/zip-it-and-ship-it-4.19.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" @@ -101584,6 +102568,7 @@ in sources."@nodelib/fs.walk-1.2.8" (sources."@oclif/color-0.1.2" // { dependencies = [ + sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" (sources."chalk-3.0.0" // { dependencies = [ @@ -101623,7 +102608,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.30" // { + (sources."@oclif/core-0.5.31" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."ansi-styles-4.3.0" @@ -101667,6 +102652,7 @@ in (sources."@oclif/plugin-not-found-1.2.4" // { dependencies = [ sources."ansi-escapes-3.2.0" + sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."clean-stack-2.2.0" @@ -101686,7 +102672,6 @@ in dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" - sources."npm-run-path-4.0.1" sources."tslib-2.3.1" sources."universalify-2.0.0" ]; @@ -101741,16 +102726,16 @@ in sources."@types/http-proxy-1.17.7" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" - sources."@types/istanbul-reports-1.1.2" + sources."@types/istanbul-reports-3.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.6.1" + sources."@types/node-16.7.0" sources."@types/node-fetch-2.5.12" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" sources."@types/responselike-1.0.0" sources."@types/semver-7.3.8" - sources."@types/yargs-13.0.12" + sources."@types/yargs-15.0.14" sources."@types/yargs-parser-20.2.1" sources."@typescript-eslint/types-4.29.2" (sources."@typescript-eslint/typescript-estree-4.29.2" // { @@ -101784,20 +102769,22 @@ in (sources."all-node-versions-8.0.0" // { dependencies = [ sources."@jest/types-25.5.0" - sources."@types/yargs-15.0.14" - sources."ansi-regex-5.0.0" + sources."@types/istanbul-reports-1.1.2" sources."ansi-styles-4.3.0" + sources."camelcase-5.3.1" 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."react-is-16.13.1" sources."supports-color-7.2.0" ]; }) (sources."ansi-align-3.0.0" // { dependencies = [ + sources."ansi-regex-4.1.0" sources."emoji-regex-7.0.3" sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" @@ -101805,7 +102792,7 @@ in ]; }) sources."ansi-escapes-4.3.2" - sources."ansi-regex-4.1.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-5.2.0" sources."ansicolors-0.3.2" sources."any-observable-0.3.0" @@ -101819,7 +102806,6 @@ in (sources."archiver-utils-2.1.0" // { dependencies = [ sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" ]; }) sources."argparse-2.0.1" @@ -101869,7 +102855,6 @@ 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" ]; @@ -101880,7 +102865,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.16.7" + sources."browserslist-4.16.8" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -101909,7 +102894,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" - sources."camelcase-5.3.1" + sources."camelcase-6.2.0" sources."caniuse-lite-1.0.30001251" sources."cardinal-2.1.1" (sources."chalk-4.1.2" // { @@ -102007,17 +102992,9 @@ in sources."dot-prop-5.3.0" ]; }) - (sources."content-disposition-0.5.3" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."content-disposition-0.5.3" sources."content-type-1.0.4" - (sources."convert-source-map-1.8.0" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."convert-source-map-1.8.0" sources."cookie-0.4.1" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" @@ -102026,10 +103003,9 @@ in sources."pump-1.0.3" sources."readable-stream-2.3.7" sources."readdirp-2.2.1" - sources."safe-buffer-5.1.2" ]; }) - (sources."core-js-compat-3.16.1" // { + (sources."core-js-compat-3.16.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -102044,12 +103020,7 @@ in }) sources."crc-32-1.2.0" sources."crc32-stream-4.0.2" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."path-key-2.0.1" - sources."semver-5.7.1" - ]; - }) + sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" sources."cyclist-1.0.1" sources."date-fns-1.30.1" @@ -102077,19 +103048,21 @@ 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" ]; }) (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" // { @@ -102177,7 +103150,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.806" + sources."electron-to-chromium-1.3.813" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -102206,12 +103179,7 @@ in sources."eventemitter3-4.0.7" (sources."execa-5.1.1" // { dependencies = [ - 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."human-signals-2.1.0" ]; }) sources."exit-on-epipe-1.0.1" @@ -102238,7 +103206,6 @@ in dependencies = [ sources."cookie-0.4.0" sources."debug-2.6.9" - sources."safe-buffer-5.1.2" ]; }) sources."express-logging-1.1.1" @@ -102267,8 +103234,7 @@ in sources."fast-glob-2.2.7" sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.8" - sources."fast-stringify-1.1.2" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."fd-slicer-1.1.0" sources."fecha-4.2.1" (sources."fetch-node-website-5.0.3" // { @@ -102280,10 +103246,10 @@ in }) sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.6" - sources."@types/yargs-15.0.14" - sources."ansi-regex-5.0.0" + sources."@types/istanbul-reports-1.1.2" sources."ansi-styles-4.3.0" sources."cacheable-request-7.0.2" + sources."camelcase-5.3.1" sources."decompress-response-5.0.0" sources."defer-to-connect-2.0.1" sources."get-stream-5.2.0" @@ -102302,6 +103268,7 @@ in sources."normalize-url-6.1.0" sources."p-cancelable-2.1.1" sources."pretty-format-25.5.0" + sources."react-is-16.13.1" sources."responselike-2.0.0" sources."supports-color-7.2.0" sources."type-fest-0.10.0" @@ -102332,7 +103299,7 @@ in sources."flush-write-stream-2.0.0" sources."fn.name-1.1.0" sources."folder-walker-3.2.0" - sources."follow-redirects-1.14.1" + sources."follow-redirects-1.14.2" sources."for-in-1.0.2" sources."form-data-3.0.1" sources."forwarded-0.2.0" @@ -102341,7 +103308,6 @@ in (sources."from2-2.3.0" // { dependencies = [ sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" ]; }) sources."from2-array-0.0.4" @@ -102429,7 +103395,6 @@ in }) (sources."hasha-5.2.2" // { dependencies = [ - sources."is-stream-2.0.1" sources."type-fest-0.8.1" ]; }) @@ -102437,7 +103402,6 @@ 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" ]; }) @@ -102457,7 +103421,7 @@ in ]; }) sources."https-proxy-agent-5.0.0" - sources."human-signals-2.1.0" + sources."human-signals-1.1.1" sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" @@ -102505,7 +103469,7 @@ in sources."ci-info-2.0.0" ]; }) - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-docker-2.2.1" @@ -102533,7 +103497,7 @@ in sources."is-promise-2.2.2" sources."is-reference-1.2.1" sources."is-retry-allowed-1.2.0" - sources."is-stream-1.1.0" + sources."is-stream-2.0.1" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-url-1.2.4" @@ -102545,17 +103509,8 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isurl-1.0.0" - sources."jest-get-type-24.9.0" - (sources."jest-validate-24.9.0" // { - 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."jest-get-type-26.3.0" + sources."jest-validate-26.6.2" (sources."jest-worker-26.6.2" // { dependencies = [ sources."has-flag-4.0.0" @@ -102587,7 +103542,6 @@ in (sources."lazystream-1.0.0" // { dependencies = [ sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" ]; }) sources."leven-3.1.0" @@ -102595,6 +103549,7 @@ 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" ]; }) @@ -102644,17 +103599,7 @@ in sources."lodash.templatesettings-4.2.0" sources."lodash.transform-4.6.0" sources."lodash.union-4.6.0" - (sources."log-process-errors-5.1.2" // { - dependencies = [ - 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-process-errors-6.3.0" sources."log-symbols-4.1.0" (sources."log-update-2.3.0" // { dependencies = [ @@ -102719,21 +103664,12 @@ in sources."mkdirp-0.5.5" sources."module-definition-3.3.1" sources."moize-6.0.3" - (sources."move-file-1.2.0" // { - dependencies = [ - (sources."cp-file-6.2.0" // { - dependencies = [ - sources."make-dir-2.1.0" - ]; - }) - sources."path-exists-3.0.0" - sources."semver-5.7.1" - ]; - }) + sources."move-file-2.1.0" sources."ms-2.0.0" (sources."multiparty-4.2.2" // { dependencies = [ sources."http-errors-1.8.0" + sources."safe-buffer-5.2.1" sources."setprototypeof-1.2.0" ]; }) @@ -102748,24 +103684,25 @@ in sources."qs-6.10.1" ]; }) - sources."netlify-headers-parser-3.0.1" + sources."netlify-headers-parser-4.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" - sources."node-releases-1.1.74" + sources."node-releases-1.1.75" sources."node-source-walk-4.2.0" (sources."node-version-alias-1.0.1" // { dependencies = [ sources."@jest/types-25.5.0" - sources."@types/yargs-15.0.14" - sources."ansi-regex-5.0.0" + sources."@types/istanbul-reports-1.1.2" sources."ansi-styles-4.3.0" + sources."camelcase-5.3.1" 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."react-is-16.13.1" sources."supports-color-7.2.0" ]; }) @@ -102773,14 +103710,15 @@ in (sources."normalize-node-version-10.0.0" // { dependencies = [ sources."@jest/types-25.5.0" - sources."@types/yargs-15.0.14" - sources."ansi-regex-5.0.0" + sources."@types/istanbul-reports-1.1.2" sources."ansi-styles-4.3.0" + sources."camelcase-5.3.1" 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."react-is-16.13.1" sources."supports-color-7.2.0" ]; }) @@ -102792,11 +103730,7 @@ 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-2.0.2" // { - dependencies = [ - sources."path-key-2.0.1" - ]; - }) + sources."npm-run-path-4.0.1" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { @@ -102846,7 +103780,7 @@ in sources."restore-cursor-3.1.0" ]; }) - sources."os-name-3.1.0" + sources."os-name-4.0.1" sources."os-tmpdir-1.0.2" (sources."p-all-2.1.0" // { dependencies = [ @@ -102871,12 +103805,8 @@ in }) sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" - sources."p-limit-2.3.0" - (sources."p-locate-5.0.0" // { - dependencies = [ - sources."p-limit-3.1.0" - ]; - }) + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" sources."p-map-4.0.0" sources."p-reduce-2.1.0" sources."p-timeout-2.0.1" @@ -102894,7 +103824,6 @@ in (sources."parallel-transform-1.2.0" // { dependencies = [ sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" ]; }) sources."parse-github-url-1.0.2" @@ -102906,6 +103835,12 @@ 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" @@ -102920,13 +103855,7 @@ in sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - (sources."pkg-dir-4.2.0" // { - dependencies = [ - sources."find-up-4.1.0" - sources."locate-path-5.0.0" - sources."p-locate-4.1.0" - ]; - }) + sources."pkg-dir-5.0.0" sources."posix-character-classes-0.1.1" sources."postcss-8.3.6" sources."postcss-values-parser-2.0.1" @@ -102934,11 +103863,9 @@ in sources."precond-0.2.3" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" - (sources."pretty-format-24.9.0" // { + (sources."pretty-format-26.6.2" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."ansi-styles-4.3.0" ]; }) sources."pretty-ms-7.0.1" @@ -102963,7 +103890,7 @@ in ]; }) sources."rc-1.2.8" - sources."react-is-16.13.1" + sources."react-is-17.0.2" sources."read-package-json-fast-2.0.3" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -102974,6 +103901,7 @@ in dependencies = [ sources."find-up-4.1.0" sources."locate-path-5.0.0" + sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."type-fest-0.8.1" ]; @@ -103033,7 +103961,7 @@ in sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."rxjs-6.6.7" - sources."safe-buffer-5.2.1" + sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -103063,8 +103991,8 @@ in ]; }) sources."setprototypeof-1.1.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.3" (sources."simple-swizzle-0.2.2" // { @@ -103161,20 +104089,11 @@ in sources."statuses-1.5.0" sources."strict-uri-encode-1.1.0" sources."string-width-4.2.2" - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - (sources."strip-ansi-6.0.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - ]; - }) + sources."string_decoder-1.1.1" + sources."strip-ansi-6.0.0" sources."strip-ansi-control-characters-2.0.0" sources."strip-bom-3.0.0" sources."strip-dirs-2.1.0" - 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" // { @@ -103202,7 +104121,6 @@ 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" ]; }) @@ -103216,7 +104134,6 @@ in (sources."through2-2.0.5" // { dependencies = [ sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" ]; }) sources."through2-filter-3.0.0" @@ -103305,24 +104222,19 @@ in }) sources."wcwidth-1.0.1" sources."well-known-symbols-2.0.0" - sources."which-1.3.1" + sources."which-2.0.2" sources."which-module-2.0.0" sources."widest-line-3.1.0" - (sources."windows-release-3.3.3" // { + (sources."windows-release-4.0.0" // { dependencies = [ - sources."execa-1.0.0" - sources."get-stream-4.1.0" - ]; - }) - (sources."winston-3.3.3" // { - dependencies = [ - sources."is-stream-2.0.1" + sources."execa-4.1.0" + sources."get-stream-5.2.0" ]; }) + sources."winston-3.3.3" (sources."winston-transport-4.4.0" // { dependencies = [ sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" ]; }) sources."word-wrap-1.2.3" @@ -103341,10 +104253,15 @@ in dependencies = [ sources."find-up-4.1.0" sources."locate-path-5.0.0" + sources."p-limit-2.3.0" sources."p-locate-4.1.0" ]; }) - sources."yargs-parser-18.1.3" + (sources."yargs-parser-18.1.3" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) sources."yarn-1.22.11" sources."yauzl-2.10.0" sources."yocto-queue-0.1.0" @@ -103473,7 +104390,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-6.1.8" + sources."tar-6.1.10" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."util-deprecate-1.0.2" @@ -103622,7 +104539,7 @@ in sources."invert-kv-1.0.0" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" @@ -103877,7 +104794,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.17" // { + (sources."tar-4.4.19" // { dependencies = [ sources."safe-buffer-5.2.1" ]; @@ -103931,7 +104848,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.6.1" + sources."@types/node-16.7.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" @@ -104070,7 +104987,7 @@ in }) sources."fast-deep-equal-3.1.3" sources."finalhandler-1.1.2" - sources."follow-redirects-1.14.1" + sources."follow-redirects-1.14.2" sources."form-data-4.0.0" sources."forwarded-0.2.0" sources."fresh-0.5.2" @@ -104371,7 +105288,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -104460,7 +105377,7 @@ in ]; }) sources."strip-ansi-3.0.1" - (sources."tar-6.1.8" // { + (sources."tar-6.1.10" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -104691,7 +105608,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.6.1" + sources."@types/node-16.7.0" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -104787,7 +105704,7 @@ in sources."execa-5.1.1" sources."external-editor-3.1.0" sources."fast-glob-3.2.7" - sources."fastq-1.11.1" + sources."fastq-1.12.0" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" @@ -104871,7 +105788,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -104989,7 +105906,7 @@ in sources."type-fest-0.4.1" ]; }) - (sources."normalize-package-data-3.0.2" // { + (sources."normalize-package-data-3.0.3" // { dependencies = [ sources."hosted-git-info-4.0.2" ]; @@ -105195,10 +106112,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.20.6"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.20.6.tgz"; - sha512 = "SRx0i1sMZDf8cd0/JokYD0EPZg0BS1iTylU9MSWw07N6/9CZHjMpZL/p8gsww7m2JsWAsTamhmGl15dQ9UgUgw=="; + url = "https://registry.npmjs.org/npm/-/npm-7.21.0.tgz"; + sha512 = "OYSQykXItCDXYGb9U8o85Snhmbe0k/nwVK6CmUNmgtOcfPevVB5ZXwA44eWOCvM+WdWYQsJAJoA7eCHKImQt8g=="; }; buildInputs = globalBuildInputs; meta = { @@ -105227,7 +106144,7 @@ in 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."@npmcli/run-script-1.8.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" @@ -105321,7 +106238,7 @@ in sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-memoize-2.5.2" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."figgy-pudding-3.5.2" sources."fill-range-7.0.1" sources."find-up-5.0.0" @@ -105415,7 +106332,7 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-9.0.4" + sources."make-fetch-happen-9.0.5" sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."mime-db-1.49.0" @@ -105507,7 +106424,7 @@ in sources."slash-3.0.0" sources."smart-buffer-4.2.0" sources."socks-2.6.1" - sources."socks-proxy-agent-5.0.1" + sources."socks-proxy-agent-6.0.0" sources."spawn-please-1.0.0" sources."sshpk-1.16.1" sources."ssri-8.0.1" @@ -105516,7 +106433,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.8" + sources."tar-6.1.10" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" @@ -106039,7 +106956,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.16.7" + sources."browserslist-4.16.8" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -106083,7 +107000,7 @@ in sources."convert-source-map-1.8.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.16.1" // { + (sources."core-js-compat-3.16.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -106194,7 +107111,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.806" + sources."electron-to-chromium-1.3.813" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -106337,7 +107254,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.4" sources."is-color-stop-1.1.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -106458,7 +107375,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.74" + sources."node-releases-1.1.75" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -107311,7 +108228,7 @@ in sources."ipaddr.js-2.0.1" sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-date-object-1.0.5" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" @@ -107914,7 +108831,7 @@ in sources."expand-template-2.0.3" sources."fast-glob-3.2.7" sources."fast-levenshtein-2.0.6" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."fill-range-7.0.1" sources."from2-2.3.0" sources."fs-constants-1.0.0" @@ -107942,7 +108859,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."into-stream-6.0.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -108050,10 +108967,10 @@ in pm2 = nodeEnv.buildNodePackage { name = "pm2"; packageName = "pm2"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pm2/-/pm2-5.1.0.tgz"; - sha512 = "reJ35NOxM4+g7H0enW47HJsp32CszKkseCojAuUMUkffyXsGDKBMnDqhxAZMZKtHUUjl0cWFEqKehqB0ODH8Kw=="; + url = "https://registry.npmjs.org/pm2/-/pm2-5.1.1.tgz"; + sha512 = "2Agpn2IVXOKu8kP+qaxKOvMLNtbZ6lY4bzKcEW2d2tw7O0lpNO7QvDayY4af+8U1+WCn90UjPK4q2wPFVHt/sA=="; }; dependencies = [ (sources."@opencensus/core-0.0.9" // { @@ -108094,7 +109011,11 @@ in sources."ansi-colors-4.1.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" - sources."argparse-1.0.10" + (sources."argparse-1.0.10" // { + dependencies = [ + sources."sprintf-js-1.0.3" + ]; + }) sources."ast-types-0.13.4" sources."async-3.2.1" (sources."async-listener-0.6.10" // { @@ -108107,7 +109028,6 @@ in sources."binary-extensions-2.2.0" sources."blessed-0.1.81" sources."bodec-0.1.0" - sources."boolean-3.1.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-from-1.1.2" @@ -108140,11 +109060,10 @@ in sources."eventemitter2-5.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" sources."file-uri-to-path-2.0.0" sources."fill-range-7.0.1" - sources."follow-redirects-1.14.1" + sources."follow-redirects-1.14.2" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -108167,7 +109086,7 @@ in sources."ini-1.3.8" sources."ip-1.1.5" sources."is-binary-path-2.1.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" @@ -108241,7 +109160,7 @@ in sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."source-map-support-0.5.19" - sources."sprintf-js-1.0.3" + sources."sprintf-js-1.1.2" sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" @@ -108376,7 +109295,7 @@ in sources."emoji-regex-8.0.0" sources."escalade-3.1.1" sources."fast-glob-3.2.7" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."fill-range-7.0.1" sources."fs-extra-9.1.0" sources."fsevents-2.3.2" @@ -108496,7 +109415,7 @@ in sources."fs.realpath-1.0.0" sources."gaze-1.1.3" sources."glob-7.1.7" - sources."globule-1.3.2" + sources."globule-1.3.3" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isexe-2.0.0" @@ -108625,7 +109544,7 @@ in sources."gaze-1.1.3" sources."get-assigned-identifiers-1.2.0" sources."glob-7.1.7" - sources."globule-1.3.2" + sources."globule-1.3.3" sources."graceful-fs-4.2.8" sources."has-1.0.3" (sources."hash-base-3.1.0" // { @@ -108647,7 +109566,7 @@ in ]; }) sources."is-buffer-1.1.6" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."json-stable-stringify-0.0.1" @@ -108882,7 +109801,7 @@ in sources."defer-to-connect-1.1.3" sources."duplexer3-0.1.4" sources."end-of-stream-1.4.4" - sources."follow-redirects-1.14.1" + sources."follow-redirects-1.14.2" sources."fs-extra-9.1.0" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" @@ -109035,7 +109954,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."invert-kv-2.0.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-fullwidth-code-point-1.0.0" sources."is-stream-1.1.0" sources."is-url-1.2.4" @@ -109440,7 +110359,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.6.1" + sources."@types/node-16.7.0" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -109594,7 +110513,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."browserslist-4.16.7" + sources."browserslist-4.16.8" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -109713,7 +110632,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.16.1" // { + (sources."core-js-compat-3.16.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -109857,7 +110776,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.806" + sources."electron-to-chromium-1.3.813" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -109991,7 +110910,7 @@ in sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.14.1" + sources."follow-redirects-1.14.2" sources."for-in-1.0.2" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" @@ -110156,7 +111075,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.4" sources."is-color-stop-1.1.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.5" sources."is-deflate-1.0.0" @@ -110299,7 +111218,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.74" + sources."node-releases-1.1.75" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" (sources."normalize-url-2.0.1" // { @@ -111245,16 +112164,16 @@ in sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" - sources."@exodus/schemasafe-1.0.0-rc.3" + sources."@exodus/schemasafe-1.0.0-rc.4" sources."@redocly/ajv-8.6.2" - (sources."@redocly/openapi-core-1.0.0-beta.54" // { + (sources."@redocly/openapi-core-1.0.0-beta.55" // { dependencies = [ - sources."@types/node-14.17.9" + sources."@types/node-14.17.10" ]; }) sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.9" - sources."@types/node-15.14.7" + sources."@types/node-15.14.8" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" @@ -111584,7 +112503,7 @@ in sources."ink-2.7.1" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."js-tokens-4.0.0" @@ -111778,7 +112697,7 @@ in 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-14.17.10" sources."@types/node-fetch-2.5.12" sources."@types/vscode-1.59.0" sources."@typescript-eslint/eslint-plugin-4.29.2" @@ -111841,8 +112760,8 @@ in 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-7.0.1" + sources."d3-array-3.0.2" sources."d3-axis-3.0.0" sources."d3-brush-3.0.0" sources."d3-chord-3.0.1" @@ -111949,7 +112868,7 @@ in sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" @@ -112027,7 +112946,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-9.0.3" // { + (sources."mocha-9.1.0" // { dependencies = [ sources."argparse-2.0.1" (sources."debug-4.3.1" // { @@ -112243,7 +113162,7 @@ in sources."commander-1.3.2" ]; }) - sources."follow-redirects-1.14.1" + sources."follow-redirects-1.14.2" sources."formidable-1.0.11" sources."fresh-0.2.0" sources."function-bind-1.1.1" @@ -112297,10 +113216,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.37.5"; + version = "1.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.37.5.tgz"; - sha512 = "Cx3ewxz9QB/ErnVIiWg2cH0kiYZ0FPvheDTVC6BsiEGBTZKKZJ1Gq5Kq6jy3PKtL6+EJ8NIoaBW/RSd2R6cZOA=="; + url = "https://registry.npmjs.org/sass/-/sass-1.38.0.tgz"; + sha512 = "WBccZeMigAGKoI+NgD7Adh0ab1HUq+6BmyBUEaGxtErbUtWUevEbdgo5EZiJQofLUGcKtlNaO2IdN73AHEua5g=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -112470,10 +113389,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.54.0"; + version = "2.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.54.0.tgz"; - sha512 = "z/cVR0jg7QN2YRP9SvcJGM2nZPGI2b+EWxrbJy3PfY1VhBfJsODQjkdwOpsmiYVxX8UYxOrjO507JJRm2Fn3Aw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.55.0.tgz"; + sha512 = "PFKPxJvdwro7DgF1/0WmAGryJCj6DIoyB44B+B1G6Sxqq/yXZ3j8pccbUIGHtAYNJFp0kr7U1y8sHxcAuBw5kQ=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -112506,7 +113425,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.15.0" // { + (sources."@serverless/components-3.15.1" // { dependencies = [ (sources."@serverless/utils-4.1.0" // { dependencies = [ @@ -112548,7 +113467,7 @@ in ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-5.6.0" // { + (sources."@serverless/utils-5.7.0" // { dependencies = [ sources."get-stream-6.0.1" sources."write-file-atomic-3.0.3" @@ -112565,7 +113484,7 @@ in sources."@types/keyv-3.1.2" sources."@types/lodash-4.14.172" sources."@types/long-4.0.1" - sources."@types/node-16.6.1" + sources."@types/node-16.7.0" sources."@types/request-2.48.7" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" @@ -112626,7 +113545,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.968.0" // { + (sources."aws-sdk-2.973.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -112799,7 +113718,7 @@ in sources."deferred-0.7.11" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."denque-1.5.0" + sources."denque-1.5.1" sources."detect-libc-1.0.3" sources."diagnostics-1.1.1" sources."dijkstrajs-1.0.2" @@ -112851,7 +113770,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.8" sources."fastest-levenshtein-1.0.12" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."fd-slicer-1.1.0" sources."fecha-4.2.1" sources."figures-3.2.0" @@ -112863,7 +113782,7 @@ in sources."fill-range-7.0.1" sources."find-requires-1.0.0" sources."flat-5.0.2" - sources."follow-redirects-1.14.1" + sources."follow-redirects-1.14.2" sources."forever-agent-0.6.1" sources."form-data-2.5.1" sources."formidable-1.2.2" @@ -113244,7 +114163,7 @@ in sources."untildify-3.0.3" ]; }) - (sources."tar-6.1.8" // { + (sources."tar-6.1.10" // { dependencies = [ sources."chownr-2.0.0" sources."mkdirp-1.0.4" @@ -113981,14 +114900,14 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.683.0"; + version = "1.684.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.683.0.tgz"; - sha512 = "cvdSuSuHyb7ijF68afG/Nbxm4wxnPQQCMjB0SYqTln+W7tMY8wLUr86QaQZIBN2Umb7zgY40gBRDq2R2nYVZGQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.684.0.tgz"; + sha512 = "Pwfr6hQdp6xrFA5Go3zOm+epQrfjygnbgsuH3g8j1eMXvFuq6pDbkvf802slTIb6kPLsIi2Ot9NW1AlT0oqutQ=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" - sources."@deepcode/dcignore-1.0.2" + sources."@deepcode/dcignore-1.0.4" sources."@iarna/toml-2.2.5" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -113998,7 +114917,7 @@ in sources."@sindresorhus/is-4.0.1" sources."@snyk/child-process-0.3.1" sources."@snyk/cli-interface-2.11.0" - sources."@snyk/cloud-config-parser-1.10.1" + sources."@snyk/cloud-config-parser-1.10.2" sources."@snyk/cocoapods-lockfile-parser-3.6.2" (sources."@snyk/code-client-4.0.0" // { dependencies = [ @@ -114143,7 +115062,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binjumper-0.1.4" sources."bl-4.1.0" - sources."boolean-3.1.2" + sources."boolean-3.1.4" sources."bottleneck-2.19.5" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -114183,7 +115102,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."configstore-5.0.1" - sources."core-js-3.16.1" + sources."core-js-3.16.2" sources."core-util-is-1.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ @@ -114243,7 +115162,7 @@ in sources."micromatch-4.0.4" ]; }) - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."figures-3.2.0" sources."fill-range-7.0.1" sources."fs-constants-1.0.0" @@ -114597,7 +115516,7 @@ in }) sources."strip-eof-1.0.0" sources."supports-color-7.2.0" - sources."tar-6.1.8" + sources."tar-6.1.10" sources."tar-stream-2.2.0" sources."temp-dir-2.0.0" (sources."tempy-1.0.1" // { @@ -114677,7 +115596,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.6.1" + sources."@types/node-16.7.0" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -114774,7 +115693,7 @@ in sources."ini-1.3.8" sources."is-arrayish-0.2.1" sources."is-ci-1.2.1" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -114882,6 +115801,27 @@ in bypassCache = true; reconstructLock = true; }; + sql-formatter = nodeEnv.buildNodePackage { + name = "sql-formatter"; + packageName = "sql-formatter"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-4.0.2.tgz"; + sha512 = "R6u9GJRiXZLr/lDo8p56L+OyyN2QFJPCDnsyEOsbdIpsnDKL8gubYFo7lNR7Zx7hfdWT80SfkoVS0CMaF/DE2w=="; + }; + dependencies = [ + sources."argparse-2.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Format whitespace in a SQL query to make it more readable"; + homepage = "https://github.com/zeroturnaround/sql-formatter#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; ssb-server = nodeEnv.buildNodePackage { name = "ssb-server"; packageName = "ssb-server"; @@ -115172,7 +116112,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.4" sources."is-canonical-base64-1.1.1" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -115217,7 +116157,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."jitdb-3.1.7" // { + (sources."jitdb-3.2.0" // { dependencies = [ sources."mkdirp-1.0.4" sources."push-stream-11.0.1" @@ -115311,6 +116251,7 @@ in sources."nearley-2.20.1" sources."next-tick-1.1.0" sources."nice-try-1.0.5" + sources."node-bindgen-loader-1.0.1" sources."node-gyp-build-4.2.3" sources."non-private-ip-1.4.4" sources."normalize-path-2.1.1" @@ -115616,7 +116557,7 @@ in sources."ssb-client-4.9.0" sources."ssb-config-3.4.5" sources."ssb-db-19.2.0" - (sources."ssb-db2-2.1.5" // { + (sources."ssb-db2-2.3.0" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -115676,6 +116617,8 @@ in sources."ssb-keys-8.2.0" ]; }) + sources."ssb-validate2-0.1.1" + sources."ssb-validate2-rsjs-node-1.0.0" sources."ssb-ws-6.2.3" sources."stack-0.1.0" (sources."static-extend-0.1.2" // { @@ -115879,7 +116822,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.968.0" // { + (sources."aws-sdk-2.973.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -116064,7 +117007,7 @@ in sources."fd-slicer-1.1.0" sources."finalhandler-1.1.2" sources."find-up-3.0.0" - sources."follow-redirects-1.14.1" + sources."follow-redirects-1.14.2" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."formidable-1.2.2" @@ -116133,7 +117076,7 @@ in sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" (sources."is-expression-3.0.0" // { dependencies = [ sources."acorn-4.0.13" @@ -116694,7 +117637,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@stylelint/postcss-css-in-js-0.37.2" sources."@stylelint/postcss-markdown-0.36.2" - sources."@types/mdast-3.0.7" + sources."@types/mdast-3.0.8" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" @@ -116714,7 +117657,7 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.16.7" + sources."browserslist-4.16.8" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" @@ -116756,7 +117699,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.806" + sources."electron-to-chromium-1.3.813" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -116767,7 +117710,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fastest-levenshtein-1.0.12" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -116807,7 +117750,7 @@ in sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-decimal-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -116852,8 +117795,8 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.74" - (sources."normalize-package-data-3.0.2" // { + sources."node-releases-1.1.75" + (sources."normalize-package-data-3.0.3" // { dependencies = [ sources."semver-7.3.5" ]; @@ -116986,6 +117929,74 @@ in bypassCache = true; reconstructLock = true; }; + svelte-check = nodeEnv.buildNodePackage { + name = "svelte-check"; + packageName = "svelte-check"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.4.tgz"; + sha512 = "eGEuZ3UEanOhlpQhICLjKejDxcZ9uYJlGnBGKAPW7uugolaBE6HpEBIiKFZN/TMRFFHQUURgGvsVn8/HJUBfeQ=="; + }; + dependencies = [ + sources."@types/node-16.7.0" + sources."@types/pug-2.0.5" + sources."@types/sass-1.16.1" + sources."ansi-styles-4.3.0" + sources."anymatch-3.1.2" + sources."balanced-match-1.0.2" + sources."binary-extensions-2.2.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."callsites-3.1.0" + sources."chalk-4.1.2" + sources."chokidar-3.5.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."concat-map-0.0.1" + sources."detect-indent-6.1.0" + sources."fill-range-7.0.1" + sources."fs.realpath-1.0.0" + sources."fsevents-2.3.2" + sources."glob-7.1.7" + sources."glob-parent-5.1.2" + sources."has-flag-4.0.0" + sources."import-fresh-3.3.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-binary-path-2.1.0" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."min-indent-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mri-1.1.6" + sources."normalize-path-3.0.0" + sources."once-1.4.0" + sources."parent-module-1.0.1" + sources."path-is-absolute-1.0.1" + sources."picomatch-2.3.0" + sources."readdirp-3.6.0" + sources."resolve-from-4.0.0" + sources."sade-1.7.4" + sources."source-map-0.7.3" + sources."strip-indent-3.0.0" + sources."supports-color-7.2.0" + sources."svelte-preprocess-4.7.4" + sources."to-regex-range-5.0.1" + sources."typescript-4.3.5" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Svelte Code Checker Terminal Interface"; + homepage = "https://github.com/sveltejs/language-tools#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; @@ -116998,7 +118009,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.6.1" + sources."@types/node-16.7.0" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -117071,74 +118082,6 @@ in bypassCache = true; reconstructLock = true; }; - svelte-check = nodeEnv.buildNodePackage { - name = "svelte-check"; - packageName = "svelte-check"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.4.tgz"; - sha512 = "eGEuZ3UEanOhlpQhICLjKejDxcZ9uYJlGnBGKAPW7uugolaBE6HpEBIiKFZN/TMRFFHQUURgGvsVn8/HJUBfeQ=="; - }; - dependencies = [ - sources."@types/node-16.6.1" - sources."@types/pug-2.0.5" - sources."@types/sass-1.16.1" - sources."ansi-styles-4.3.0" - sources."anymatch-3.1.2" - sources."balanced-match-1.0.2" - sources."binary-extensions-2.2.0" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."callsites-3.1.0" - sources."chalk-4.1.2" - sources."chokidar-3.5.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."concat-map-0.0.1" - sources."detect-indent-6.1.0" - sources."fill-range-7.0.1" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" - sources."glob-7.1.7" - sources."glob-parent-5.1.2" - sources."has-flag-4.0.0" - sources."import-fresh-3.3.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-binary-path-2.1.0" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.1" - sources."is-number-7.0.0" - sources."min-indent-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mri-1.1.6" - sources."normalize-path-3.0.0" - sources."once-1.4.0" - sources."parent-module-1.0.1" - sources."path-is-absolute-1.0.1" - sources."picomatch-2.3.0" - sources."readdirp-3.6.0" - sources."resolve-from-4.0.0" - sources."sade-1.7.4" - sources."source-map-0.7.3" - sources."strip-indent-3.0.0" - sources."supports-color-7.2.0" - sources."svelte-preprocess-4.7.4" - sources."to-regex-range-5.0.1" - sources."typescript-4.3.5" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Svelte Code Checker Terminal Interface"; - homepage = "https://github.com/sveltejs/language-tools#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; @@ -118133,7 +119076,7 @@ in sources."@textlint/textlint-plugin-text-12.0.2" sources."@textlint/types-12.0.2" sources."@textlint/utils-12.0.2" - sources."@types/mdast-3.0.7" + sources."@types/mdast-3.0.8" sources."@types/unist-2.0.6" sources."ajv-8.6.2" sources."ansi-regex-2.1.1" @@ -118196,7 +119139,7 @@ in sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-date-object-1.0.5" sources."is-decimal-1.0.4" sources."is-file-1.0.0" @@ -118563,7 +119506,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-decimal-1.0.4" sources."is-empty-1.2.0" sources."is-fullwidth-code-point-2.0.0" @@ -119231,7 +120174,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.6.1" + sources."@types/node-16.7.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -119307,7 +120250,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.16.1" + sources."core-js-3.16.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -119618,7 +120561,7 @@ in sources."strip-outer-1.0.1" sources."strtok3-6.2.4" sources."supports-color-7.2.0" - sources."tar-4.4.17" + sources."tar-4.4.19" sources."tlds-1.208.0" sources."to-array-0.1.4" sources."to-readable-stream-1.0.0" @@ -120137,7 +121080,7 @@ in sources."del-6.0.0" sources."dir-glob-3.0.1" sources."fast-glob-3.2.7" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."fill-range-7.0.1" sources."fs-extra-10.0.0" sources."fs.realpath-1.0.0" @@ -120245,7 +121188,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-14.17.9" + sources."@types/node-14.17.10" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" @@ -120526,7 +121469,7 @@ in sha512 = "N+ENrder8z9zJQF9UM7K3/1LcfVW60omqeyaQsu6GN1BGdCgPm8gdHssn7WRD7vx+ABKc82IE1+pJyHOPkwe+w=="; }; dependencies = [ - sources."@types/node-16.6.1" + sources."@types/node-16.7.0" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -120741,7 +121684,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."internmap-1.0.1" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" sources."lru-cache-6.0.0" @@ -120781,7 +121724,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-6.1.8" + sources."tar-6.1.10" sources."topojson-client-3.1.0" sources."util-deprecate-1.0.2" sources."vega-5.20.2" @@ -120904,7 +121847,7 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.6.1" + sources."@types/node-16.7.0" sources."@vercel/build-utils-2.12.2" sources."@vercel/go-1.2.3" sources."@vercel/node-1.12.1" @@ -121143,7 +122086,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -121490,7 +122433,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."browserslist-4.16.7" + sources."browserslist-4.16.8" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."call-bind-1.0.2" @@ -121535,7 +122478,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.806" + sources."electron-to-chromium-1.3.814" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -121583,7 +122526,7 @@ in sources."inherits-2.0.4" sources."interpret-2.2.0" sources."is-binary-path-2.1.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -121637,7 +122580,7 @@ in sources."mute-stream-0.0.8" sources."nanoid-3.1.20" sources."neo-async-2.6.2" - sources."node-releases-1.1.74" + sources."node-releases-1.1.75" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."nth-check-2.0.0" @@ -121744,7 +122687,7 @@ in sources."vscode-debugadapter-testsupport-1.48.0" sources."vscode-debugprotocol-1.48.0" sources."watchpack-2.2.0" - sources."webpack-5.50.0" + sources."webpack-5.51.1" (sources."webpack-cli-4.8.0" // { dependencies = [ sources."commander-7.2.0" @@ -122101,7 +123044,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.6.1" + sources."@types/node-16.7.0" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -122456,7 +123399,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-data-descriptor-1.0.0" sources."is-decimal-1.0.4" sources."is-descriptor-1.0.2" @@ -123076,7 +124019,7 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-js-pure-3.16.1" + sources."core-js-pure-3.16.2" sources."core-util-is-1.0.2" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { @@ -123183,7 +124126,7 @@ in sources."svg-pathdata-5.0.5" sources."svg2img-0.9.3" sources."symbol-tree-3.2.4" - sources."tar-6.1.8" + sources."tar-6.1.10" (sources."tough-cookie-4.0.0" // { dependencies = [ sources."universalify-0.1.2" @@ -123282,7 +124225,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.6.1" + sources."@types/node-16.7.0" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -123843,17 +124786,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.50.0"; + version = "5.51.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.50.0.tgz"; - sha512 = "hqxI7t/KVygs0WRv/kTgUW8Kl3YC81uyWQSo/7WUs5LsuRw0htH/fCwbVBGCuiX/t4s7qzjXFcf41O8Reiypag=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.51.1.tgz"; + sha512 = "xsn3lwqEKoFvqn4JQggPSRxE4dhsRcysWTqYABAZlmavcoTmwlOb9b1N36Inbt/eIispSkuHa80/FJkDTPos1A=="; }; dependencies = [ sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" - sources."@types/node-16.6.1" + sources."@types/node-16.7.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -123875,13 +124818,13 @@ in sources."acorn-import-assertions-1.7.6" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.16.7" + sources."browserslist-4.16.8" sources."buffer-from-1.1.2" 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.806" + sources."electron-to-chromium-1.3.814" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -123906,7 +124849,7 @@ in sources."mime-db-1.49.0" sources."mime-types-2.1.32" sources."neo-async-2.6.2" - sources."node-releases-1.1.74" + sources."node-releases-1.1.75" sources."p-limit-3.1.0" sources."punycode-2.1.1" sources."randombytes-2.1.0" @@ -123965,7 +124908,7 @@ in sources."human-signals-2.1.0" sources."import-local-3.0.2" sources."interpret-2.2.0" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-plain-object-2.0.4" sources."is-stream-2.0.1" sources."isexe-2.0.0" @@ -124010,100 +124953,49 @@ in webpack-dev-server = nodeEnv.buildNodePackage { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "3.11.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz"; - sha512 = "A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.0.0.tgz"; + sha512 = "ya5cjoBSf3LqrshZn2HMaRZQx8YRNBE+tx+CQNFGaLLHrvs4Y1aik0sl5SFhLz2cW1O9/NtyaZhthc+8UiuvkQ=="; }; dependencies = [ - sources."@types/glob-7.1.4" - sources."@types/minimatch-3.0.5" - sources."@types/node-16.6.1" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@types/http-proxy-1.17.7" + sources."@types/json-schema-7.0.9" + sources."@types/node-16.7.0" + sources."@types/retry-0.12.1" sources."accepts-1.3.7" + sources."aggregate-error-3.1.0" sources."ajv-6.12.6" - sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" - sources."ansi-colors-3.2.4" sources."ansi-html-0.0.7" - sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.1" - (sources."anymatch-2.0.0" // { - dependencies = [ - sources."normalize-path-2.1.1" - ]; - }) - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" + sources."ansi-regex-6.0.0" + sources."anymatch-3.1.2" sources."array-flatten-2.1.2" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" - sources."array-unique-0.3.2" - sources."assign-symbols-1.0.0" + sources."array-union-2.1.0" sources."async-2.6.3" - sources."async-each-1.0.3" - sources."async-limiter-1.0.1" - sources."atob-2.1.2" sources."balanced-match-1.0.2" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) sources."batch-0.6.1" - sources."binary-extensions-1.13.1" - sources."bindings-1.5.0" + sources."binary-extensions-2.2.0" (sources."body-parser-1.19.0" // { dependencies = [ sources."bytes-3.1.0" - sources."debug-2.6.9" ]; }) sources."bonjour-3.5.0" sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) + sources."braces-3.0.2" sources."buffer-indexof-1.1.1" sources."bytes-3.0.0" - sources."cache-base-1.0.1" sources."call-bind-1.0.2" - sources."camelcase-5.3.1" - sources."chokidar-2.1.8" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."cliui-5.0.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" - ]; - }) - sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."component-emitter-1.3.0" + sources."chokidar-3.5.2" + sources."clean-stack-2.2.0" + sources."colorette-1.3.0" sources."compressible-2.0.18" (sources."compression-1.7.4" // { dependencies = [ - sources."debug-2.6.9" sources."safe-buffer-5.1.2" ]; }) @@ -124117,129 +125009,64 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - (sources."debug-4.3.2" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - sources."decamelize-1.2.0" - sources."decode-uri-component-0.2.0" + sources."cross-spawn-7.0.3" + sources."debug-2.6.9" sources."deep-equal-1.1.1" - sources."default-gateway-4.2.0" + sources."default-gateway-6.0.3" + sources."define-lazy-prop-2.0.0" sources."define-properties-1.1.3" - sources."define-property-2.0.2" - sources."del-4.1.1" + sources."del-6.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" sources."detect-node-2.1.0" + sources."dir-glob-3.0.1" sources."dns-equal-1.0.0" sources."dns-packet-1.3.4" sources."dns-txt-2.0.2" sources."ee-first-1.1.1" - sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" - sources."end-of-stream-1.4.4" - sources."errno-0.1.8" sources."escape-html-1.0.3" sources."etag-1.8.1" sources."eventemitter3-4.0.7" - sources."eventsource-1.1.0" - sources."execa-1.0.0" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" - ]; - }) + sources."execa-5.1.1" (sources."express-4.17.1" // { dependencies = [ sources."array-flatten-1.1.1" - sources."debug-2.6.9" sources."safe-buffer-5.1.2" ]; }) - sources."extend-shallow-3.0.2" - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" + sources."fastq-1.12.0" sources."faye-websocket-0.11.4" - sources."file-uri-to-path-1.0.0" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) - (sources."finalhandler-1.1.2" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."find-up-3.0.0" - sources."follow-redirects-1.14.1" - sources."for-in-1.0.2" + sources."fill-range-7.0.1" + sources."finalhandler-1.1.2" + sources."follow-redirects-1.14.2" sources."forwarded-0.2.0" - sources."fragment-cache-0.2.1" sources."fresh-0.5.2" + sources."fs-monkey-1.0.3" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.13" + sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" - sources."get-stream-4.1.0" - sources."get-value-2.0.6" + sources."get-stream-6.0.1" sources."glob-7.1.7" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) - (sources."globby-6.1.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) + sources."glob-parent-5.1.2" + sources."globby-11.0.4" sources."graceful-fs-4.2.8" sources."handle-thing-2.0.1" sources."has-1.0.3" - sources."has-flag-3.0.0" sources."has-symbols-1.0.2" sources."has-tostringtag-1.0.0" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { + (sources."hpack.js-2.1.6" // { dependencies = [ - sources."kind-of-4.0.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" ]; }) - sources."hpack.js-2.1.6" - sources."html-entities-1.4.0" + sources."html-entities-2.3.2" sources."http-deceiver-1.2.7" (sources."http-errors-1.7.2" // { dependencies = [ @@ -124248,336 +125075,183 @@ in }) sources."http-parser-js-0.5.3" sources."http-proxy-1.18.1" - sources."http-proxy-middleware-0.19.1" + sources."http-proxy-middleware-2.0.1" + sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" - sources."import-local-2.0.0" + sources."ignore-5.1.8" + sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."internal-ip-4.3.0" - sources."ip-1.1.5" - sources."ip-regex-2.1.0" - sources."ipaddr.js-1.9.1" - sources."is-absolute-url-3.0.3" - sources."is-accessor-descriptor-1.0.0" - sources."is-arguments-1.1.1" - sources."is-binary-path-1.0.1" - sources."is-buffer-1.1.6" - sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.5" - sources."is-descriptor-1.0.2" - sources."is-extendable-1.0.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-4.0.1" - (sources."is-number-3.0.0" // { + (sources."internal-ip-6.2.0" // { dependencies = [ - sources."kind-of-3.2.2" + sources."ipaddr.js-1.9.1" ]; }) + sources."ip-1.1.5" + sources."ip-regex-4.3.0" + sources."ipaddr.js-2.0.1" + sources."is-arguments-1.1.1" + sources."is-binary-path-2.1.0" + sources."is-date-object-1.0.5" + sources."is-docker-2.2.1" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-ip-3.1.0" + sources."is-number-7.0.0" sources."is-path-cwd-2.2.0" - sources."is-path-in-cwd-2.1.0" - sources."is-path-inside-2.1.0" - sources."is-plain-object-2.0.4" + sources."is-path-inside-3.0.3" + sources."is-plain-obj-3.0.0" sources."is-regex-1.1.4" - sources."is-stream-1.1.0" - sources."is-windows-1.0.2" - sources."is-wsl-1.1.0" + sources."is-stream-2.0.1" + sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" sources."json-schema-traverse-0.4.1" - sources."json3-3.3.3" - sources."killable-1.0.1" - sources."kind-of-6.0.3" - sources."locate-path-3.0.0" sources."lodash-4.17.21" - sources."loglevel-1.7.1" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" + sources."map-age-cleaner-0.1.3" sources."media-typer-0.3.0" - sources."memory-fs-0.4.1" + (sources."mem-8.1.1" // { + dependencies = [ + sources."mimic-fn-3.1.0" + ]; + }) + sources."memfs-3.2.2" sources."merge-descriptors-1.0.1" + sources."merge-stream-2.0.0" + sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-3.1.10" + sources."micromatch-4.0.4" sources."mime-1.6.0" sources."mime-db-1.49.0" sources."mime-types-2.1.32" + sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mixin-deep-1.3.2" sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" - sources."nan-2.15.0" - sources."nanomatch-1.2.13" sources."negotiator-0.6.2" - sources."nice-try-1.0.5" sources."node-forge-0.10.0" sources."normalize-path-3.0.0" - sources."npm-run-path-2.0.2" - sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) + sources."npm-run-path-4.0.1" sources."object-is-1.1.5" sources."object-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" sources."obuf-1.1.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."opn-5.5.0" - sources."original-1.0.2" + sources."onetime-5.1.2" + sources."open-8.2.1" + sources."p-defer-1.0.0" + sources."p-event-4.2.0" sources."p-finally-1.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-map-2.1.0" - sources."p-retry-3.0.1" - sources."p-try-2.2.0" + sources."p-map-4.0.0" + sources."p-retry-4.6.1" + sources."p-timeout-3.2.0" sources."parseurl-1.3.3" - sources."pascalcase-0.1.1" - sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."path-is-inside-1.0.2" - sources."path-key-2.0.1" + sources."path-key-3.1.1" sources."path-to-regexp-0.1.7" - sources."pify-4.0.1" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."pkg-dir-3.0.0" + sources."path-type-4.0.0" + sources."picomatch-2.3.0" (sources."portfinder-1.0.28" // { dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" ]; }) - sources."posix-character-classes-0.1.1" sources."process-nextick-args-2.0.1" - sources."proxy-addr-2.0.7" - sources."prr-1.0.1" - sources."pump-3.0.0" + (sources."proxy-addr-2.0.7" // { + dependencies = [ + sources."ipaddr.js-1.9.1" + ]; + }) sources."punycode-2.1.1" sources."qs-6.7.0" sources."querystring-0.2.0" - sources."querystringify-2.2.0" + sources."queue-microtask-1.2.3" sources."range-parser-1.2.1" (sources."raw-body-2.4.0" // { dependencies = [ sources."bytes-3.1.0" ]; }) - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."readdirp-2.2.1" - sources."regex-not-1.0.2" + sources."readable-stream-3.6.0" + sources."readdirp-3.6.0" sources."regexp.prototype.flags-1.3.1" - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" - sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" sources."requires-port-1.0.0" - sources."resolve-cwd-2.0.0" - sources."resolve-from-3.0.0" - sources."resolve-url-0.2.1" - sources."ret-0.1.15" - sources."retry-0.12.0" - sources."rimraf-2.7.1" + sources."retry-0.13.1" + sources."reusify-1.0.4" + sources."rimraf-3.0.2" + sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" - sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."schema-utils-1.0.0" + sources."schema-utils-3.1.1" sources."select-hose-2.0.0" sources."selfsigned-1.10.11" - sources."semver-6.3.0" (sources."send-0.17.1" // { dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) sources."ms-2.1.1" ]; }) (sources."serve-index-1.9.1" // { dependencies = [ - sources."debug-2.6.9" sources."http-errors-1.6.3" sources."inherits-2.0.3" sources."setprototypeof-1.1.0" ]; }) sources."serve-static-1.14.1" - sources."set-blocking-2.0.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) sources."setprototypeof-1.1.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."slash-3.0.0" sources."sockjs-0.3.21" - (sources."sockjs-client-1.5.1" // { + (sources."spdy-4.0.2" // { dependencies = [ - sources."debug-3.2.7" - sources."ms-2.1.3" + sources."debug-4.3.2" + sources."ms-2.1.2" ]; }) - sources."source-map-0.5.7" - sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.1" - sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) - sources."split-string-3.1.0" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."debug-4.3.2" + sources."ms-2.1.2" ]; }) sources."statuses-1.5.0" - (sources."string-width-3.1.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" - ]; - }) (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) - sources."strip-ansi-3.0.1" - sources."strip-eof-1.0.0" - sources."supports-color-6.1.0" + sources."strip-ansi-7.0.0" + sources."strip-final-newline-2.0.0" sources."thunky-1.1.0" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" + sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."type-is-1.6.18" - (sources."union-value-1.0.1" // { - dependencies = [ - sources."is-extendable-0.1.1" - ]; - }) sources."unpipe-1.0.0" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."upath-1.2.0" sources."uri-js-4.4.1" - sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" ]; }) - sources."url-parse-1.5.3" - sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" sources."vary-1.1.2" sources."wbuf-1.7.3" - (sources."webpack-dev-middleware-3.7.3" // { - dependencies = [ - sources."mime-2.5.2" - ]; - }) - sources."webpack-log-2.0.0" + sources."webpack-dev-middleware-5.0.0" sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" - sources."which-1.3.1" - sources."which-module-2.0.0" - (sources."wrap-ansi-5.1.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" - ]; - }) + sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-6.2.2" - sources."y18n-4.0.3" - sources."yargs-13.3.2" - sources."yargs-parser-13.1.2" + sources."ws-8.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -124614,7 +125288,7 @@ in ]; }) sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."fill-range-7.0.1" sources."glob-parent-6.0.1" sources."globby-11.0.4" @@ -124673,7 +125347,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.6.1" + sources."@types/node-16.7.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.0" @@ -124703,7 +125377,7 @@ in sources."ms-2.1.2" ]; }) - (sources."bittorrent-tracker-9.17.4" // { + (sources."bittorrent-tracker-9.18.0" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -124744,6 +125418,7 @@ in }) sources."chunk-store-stream-4.3.0" sources."cliui-7.0.4" + sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."common-tags-1.8.0" @@ -124920,6 +125595,8 @@ in sources."ms-2.1.2" ]; }) + sources."smart-buffer-1.1.15" + sources."socks-1.1.10" sources."speed-limiter-1.0.2" sources."speedometer-1.1.0" sources."split-1.0.1" @@ -124964,7 +125641,7 @@ in sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.3.10" // { + (sources."webtorrent-1.5.3" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -125114,7 +125791,7 @@ in 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.1" // { + (sources."@npmcli/arborist-2.8.2" // { dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.5" @@ -125143,12 +125820,12 @@ in sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/package-json-1.0.1" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.5" + sources."@npmcli/run-script-1.8.6" sources."@sindresorhus/is-0.7.0" sources."@tootallnate/once-1.1.2" sources."@types/expect-1.20.4" sources."@types/minimatch-3.0.5" - sources."@types/node-15.14.7" + sources."@types/node-15.14.8" sources."@types/vinyl-2.0.5" sources."abbrev-1.1.1" (sources."agent-base-6.0.2" // { @@ -125206,7 +125883,7 @@ in sources."readable-stream-3.6.0" ]; }) - sources."boolean-3.1.2" + sources."boolean-3.1.4" (sources."boxen-1.3.0" // { dependencies = [ sources."camelcase-4.1.0" @@ -125264,7 +125941,7 @@ in sources."config-chain-1.1.13" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.16.1" + sources."core-js-3.16.2" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -125318,7 +125995,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."figures-2.0.0" sources."filelist-1.0.2" sources."fill-range-7.0.1" @@ -125410,7 +126087,7 @@ in sources."ip-regex-2.1.0" sources."is-arrayish-0.2.1" sources."is-ci-1.2.1" - sources."is-core-module-2.5.0" + sources."is-core-module-2.6.0" sources."is-docker-1.1.0" sources."is-extglob-2.1.1" sources."is-finite-1.1.0" @@ -125493,7 +126170,7 @@ in sources."lru-cache-6.0.0" sources."macos-release-2.5.0" sources."make-dir-1.3.0" - (sources."make-fetch-happen-9.0.4" // { + (sources."make-fetch-happen-9.0.5" // { dependencies = [ sources."http-cache-semantics-4.1.0" ]; @@ -125775,7 +126452,7 @@ in sources."slash-3.0.0" sources."smart-buffer-4.2.0" sources."socks-2.6.1" - (sources."socks-proxy-agent-5.0.1" // { + (sources."socks-proxy-agent-6.0.0" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -125854,7 +126531,7 @@ in ]; }) sources."taketalk-1.0.0" - (sources."tar-6.1.8" // { + (sources."tar-6.1.10" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -126029,10 +126706,10 @@ in zx = nodeEnv.buildNodePackage { name = "zx"; packageName = "zx"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/zx/-/zx-3.0.0.tgz"; - sha512 = "GPaKTImhbKfc3TmJ43g8vRT6PMhiifcUZ0ndhHqhqtJMbteTQYNzTZT+vBtdZsDMkoqxE54Vjm3bDsplE2qWFg=="; + url = "https://registry.npmjs.org/zx/-/zx-3.1.0.tgz"; + sha512 = "Dwm75vWiWPsZhZXRUmneeZQlMbRXJBDLMy+QGDyKDID2+Dkp6LCzlXTrW7VOmU66K1/w8dEcJ5r3zFCDW0kx1Q=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -126040,7 +126717,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.6.1" + sources."@types/node-16.7.0" sources."@types/node-fetch-2.5.12" sources."ansi-styles-4.3.0" sources."array-union-3.0.1" @@ -126053,12 +126730,12 @@ in sources."delayed-stream-1.0.0" sources."dir-glob-3.0.1" sources."fast-glob-3.2.7" - sources."fastq-1.11.1" + sources."fastq-1.12.0" sources."fill-range-7.0.1" sources."form-data-3.0.1" sources."fs-extra-10.0.0" sources."glob-parent-5.1.2" - sources."globby-12.0.0" + sources."globby-12.0.1" sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."ignore-5.1.8" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix index 8aaf1bcbdd..fec487aeac 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix @@ -6,12 +6,12 @@ buildDunePackage rec { pname = "luv"; - version = "0.5.9"; + version = "0.5.10"; useDune2 = true; src = fetchurl { url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz"; - sha256 = "0bbv28vgv5mnfbn1gag5fh3n4d9nkffqy3bif3pf47677c493ym2"; + sha256 = "0zygir01d6vglfs4b3klnbg90glvyl9agq5xnzn8hmsb6d8z0jqp"; }; postConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix index c9ec1b3938..a6687922bc 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPecl, php, valgrind, pcre2 }: +{ lib, stdenv, buildPecl, php, valgrind, pcre2 }: buildPecl { pname = "swoole"; @@ -6,7 +6,7 @@ buildPecl { version = "4.6.7"; sha256 = "107wp403z8skkqrcm240vyyy6wqx5a4v2bqhlshlknyi14r2v165"; - buildInputs = [ valgrind pcre2 ]; + buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix index a9ff8c6d18..6cf817f813 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.9438"; + version = "9.0.9506"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-V/0plNgApk8S/xdd0I8zeE7dqb0xBhqCVSDW7jGHpzo="; + sha256 = "sha256-ikIO6AhoBkmz4+8BLOC55Yh6HbzHJOjlktSDMiC0I38="; }; propagatedBuildInputs = [ pyvex ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix index c198676e3e..f56d31b034 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: # This package provides a binary "apython" which sometimes invokes # [sys.executable, '-m', 'aioconsole'] as a subprocess. If apython is @@ -10,21 +16,32 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.3.1"; + version = "0.3.2"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "7c038bb40b7690bf5be6b17154830b7bff25e7be1c02d8420a346c3efbd5d8e5"; + src = fetchFromGitHub { + owner = "vxgmichel"; + repo = pname; + rev = "v${version}"; + sha256 = "0bximaalakw1dxan1lxar33l8hnmxqn0fg62hmdmprmra72z4bm8"; }; - # hardcodes a test dependency on an old version of pytest-asyncio - doCheck = false; + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; - meta = { + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov aioconsole --count 2" "" + ''; + + pythonImportsCheck = [ "aioconsole" ]; + + meta = with lib; { description = "Asynchronous console and interfaces for asyncio"; homepage = "https://github.com/vxgmichel/aioconsole"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.catern ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ catern ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 589aa14509..890a37e24d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aiohttp-jinja2"; - version = "1.4.2"; + version = "1.5"; src = fetchPypi { inherit pname version; - sha256 = "9c22a0e48e3b277fc145c67dd8c3b8f609dab36bce9eb337f70dfe716663c9a0"; + sha256 = "7c3ba5eac060b691f4e50534af2d79fca2a75712ebd2b25e6fcb1295859f910b"; }; propagatedBuildInputs = [ aiohttp jinja2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix index 91d83e93cb..813eb00b1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "aioitertools"; - version = "0.7.1"; + version = "0.8.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "18ql6k2j1839jf2rmmmm29v6fb7mr59l75z8nlf0sadmydy6r9al"; + sha256 = "8b02facfbc9b0f1867739949a223f3d3267ed8663691cc95abd94e2c1d8c2b46"; }; propagatedBuildInputs = [ typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix index 414f8a6d9a..ddcd11d4ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiorun"; - version = "2020.12.1"; + version = "2021.8.1"; format = "flit"; disabled = pythonOlder "3.5"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cjrh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ktc2cmoPNYcsVyKCWs+ivhV5onywFIrdDRBiBKrdiF4="; + sha256 = "sha256-aehYPZ1+GEO+bNSsE5vVgjtVo4MRMH+vNurk+bJ1/Io="; }; propagatedBuildInputs = [ 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 859fd0dc5c..b7790751a5 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.2"; + version = "0.5.3"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zhulik"; repo = pname; - rev = "v.${version}"; - sha256 = "04qdjyxq35063jpn218vw94a4r19fknk1q2kkxr8gnaabkpkjrnf"; + rev = "v${version}"; + sha256 = "1rkylzbxxy3p744q1iqcvpnkn12ra6ja16vhqzidn702n4h5377j"; }; 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 index 30ae647b05..f10a0f03e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/alectryon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/alectryon/default.nix @@ -1,4 +1,5 @@ -{ lib, buildPythonPackage, fetchPypi, pygments, dominate, beautifulsoup4, docutils, sphinx }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch +, pygments, dominate, beautifulsoup4, docutils, sphinx }: buildPythonPackage rec { pname = "alectryon"; @@ -10,6 +11,13 @@ buildPythonPackage rec { sha256 = "sha256:0mca25jv917myb4n91ccpl5fz058aiqsn8cniflwfw5pp6lqnfg7"; }; + patches = [ + (fetchpatch { + url = "https://github.com/cpitclaudel/alectryon/commit/c779def3fa268e703d4e0ff8ae0b2981e194b269.patch"; + sha256 = "0xsz56ibq8xj7gg530pfm1jmxbxw4r6v8xvzj5k1wdry83srqi65"; + }) + ]; + propagatedBuildInputs = [ pygments dominate diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix index d0805d0624..db2ee2c13d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.9438"; + version = "9.0.9506"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-wbyuphcRw9FtVcwwQq8w0vaYZqWQ0nIyJPaZh+r8ROU="; + sha256 = "sha256-2bKsLmZeFs7N4YUYxIktDoOn/H8waaOaOJOzyVumuf8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix index 2ee8671c0e..5af743b93f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.9438"; + version = "9.0.9506"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+6fWdl5IcQTygFQbqPSfWvpqdooFN5yeBgPIblOyZEU="; + sha256 = "sha256-dTaTtiMzIm9PfVkjAED9x9zae+vdRcl1kDMtqUWvpkA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/base.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/base.nix index 0c88c37851..68063f0d77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/base.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/base.nix @@ -28,11 +28,11 @@ let in buildPythonPackage rec { pname = "ansible-base"; - version = "2.10.12"; + version = "2.10.13"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qWVW4tI5+Sg+FWVNQMGqhmgqTntD9Qtf8CK8jkK2mHg="; + sha256 = "sha256-0sKbGUblrgh4SgdiuMSMMvg15GSNb5l6bCqBt4/0860="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix index 25b36e6985..0e2d705cc8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix @@ -23,17 +23,17 @@ let ansible-collections = callPackage ./collections.nix { - version = "4.2.0"; - sha256 = "1l30j97q24klylchvbskdmp1xllswn9xskjvg4l0ra6pzfgq2zbk"; + version = "4.4.0"; + sha256 = "031n22j0lsmh69x6i6gkva81j68b4yzh1pbg3q2h4bknl85q46ag"; }; in buildPythonPackage rec { pname = "ansible-core"; - version = "2.11.3"; + version = "2.11.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DO0bT2cZftsntQk0yV1MtkTG1jXXLH+CbEQl3+RTdnQ="; + sha256 = "sha256-Iuqnwt/myHXprjgDI/HLpiWcYFCl5MiBn4X5KzaD6kk="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/legacy.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/legacy.nix index 95b127a0db..7eb0f3f940 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/legacy.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/legacy.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.24"; + version = "2.9.25"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DC9Tt75z3cNCPZZY/NGQeYl9Wx/FM8StVQ21ixea64o="; + sha256 = "sha256-i88sL1xgnluREUyosOQibWA7h/K+cdyzOOi30626oo8="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arcam-fmj/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arcam-fmj/default.nix index 55e629d935..8d74db04d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/arcam-fmj/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/arcam-fmj/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "arcam-fmj"; - version = "0.10.0"; + version = "0.11.1"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "elupus"; repo = "arcam_fmj"; rev = version; - sha256 = "sha256-pPPBeOwB2HgyxxMnR5yU3ZwDaJVP0v7/fkeDkeGGhPM="; + sha256 = "sha256-Vs32LGRN6kxG8sswvuUwuUbLv9GXuhJeK0CUGoo2EgE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index 571e4e291c..4693869485 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.9438"; + version = "9.0.9506"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C3ZBqCNzXcpeLmAPpXci2AA4D5A3cQC6rHPuf/BmT38="; + sha256 = "sha256-jGXJpwiP2/O2aJhAP15VGqrekiiB0eiIFCjkzNMbqxw="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix index 13c78783ed..04e21ac9a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , aiohttp , async-timeout , buildPythonPackage @@ -13,14 +14,14 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.19.1"; + version = "0.20.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-qxEn9UrQuwRaP7sZlu3854gDI7Gqku055DF8KvsU6p4="; + sha256 = "sha256-jxYGOljV7tcsiAgpOhbXj7g7AwyP1kDDC83PiHG6ZFg="; }; propagatedBuildInputs = [ @@ -52,6 +53,8 @@ buildPythonPackage rec { "test_subscribe_renew" "test_start_server" "test_init" + ] ++ lib.optionals stdenv.isDarwin [ + "test_deferred_callback_url" ]; pythonImportsCheck = [ "async_upnp_client" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix index e1a955fbb8..c967e6b7b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.4.0"; + version = "1.6.0"; # No tests available in PyPI tarball src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "v${version}"; - sha256 = "0g7qj74mgazc7y1w0d9vs276vmfb3svi5whn2c87bryhrwq650vf"; + sha256 = "sha256-H25Y1gusV+sSX0f6ii49bE36CgM1E3oWsX8AiVH85Y4="; }; # Package is not compatible with Python 3.5 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix index bad8ee9bd2..9da3fe3a16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.37.0"; + version = "1.38.0"; src = fetchPypi { inherit pname version; - sha256 = "0p2qd8gwxsfq17nmrlkpf31aqbfzjrwjk3n4p8vhci8mm11dk138"; + sha256 = "sha256-Dsrdqc9asjGPV/ElMYGiFR5MU8010hcXqSPAdaWmXLY="; }; # Tests are not included in the PyPI package diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix index 10c455ce07..bad63d287b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.6.0"; + version = "1.6.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2e70b00874e4f288e37804bc06bfaf216de8565c759594bf79cccfbf9ca2c78a"; + sha256 = "69035c81f280fac5fa9c55f87be3a359b264853727486e3568818bb43988080e"; }; propagatedBuildInputs = [ 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 3f69907feb..932c90cb7a 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.18"; + version = "0.7.19"; disabled = pythonOlder "3.5"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = version; - sha256 = "sha256-90Rli0tiZIO2gtx3EfPXg8U6CSKEmHUiRePjITvov/E="; + sha256 = "sha256-r5x+9W1XadtXb1ClC/0HnjrR+UmrytzUTCpi9IyBbwU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bond-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bond-api/default.nix index 39a6cc4433..9651d7289a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bond-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bond-api/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "bond-api"; - version = "0.1.12"; + version = "0.1.13"; src = fetchFromGitHub { owner = "prystupa"; repo = "bond-api"; rev = "v${version}"; - sha256 = "0zqaqqadr4x4vmq28nfk5x67gfwqqfy19z0cgrpxlbbvxamccym0"; + sha256 = "0v3bwbpn98fjm8gza2k7fb7w5ps3982kfvbck5x0fh2xq2825b80"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix index e5b1a4c4fb..1243aad64c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix @@ -35,6 +35,10 @@ buildPythonPackage rec { sha256 = "1dn7iiavsrhh6i9hcyw0mk8j95r5ym0gbrvdca998hx2rnz5ark6"; }; + postPatch = '' + substituteInPlace setup.py --replace 'geomet>=0.1,<0.3' 'geomet' + ''; + nativeBuildInputs = [ cython ]; buildInputs = [ libev ]; propagatedBuildInputs = [ six geomet ] @@ -80,6 +84,8 @@ buildPythonPackage rec { "_PoolTests" # attempts to make connection to localhost "test_connection_initialization" + # time-sensitive + "test_nts_token_performance" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cattrs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cattrs/default.nix index 409fc7b28d..45379910a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cattrs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cattrs/default.nix @@ -1,14 +1,14 @@ { lib , attrs -, bson -, pythonOlder , buildPythonPackage , fetchFromGitHub , hypothesis , immutables +, motor , msgpack , poetry-core , pytestCheckHook +, pythonOlder , pyyaml , tomlkit , ujson @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "cattrs"; - version = "1.7.0"; + version = "1.8.0"; format = "pyproject"; # https://cattrs.readthedocs.io/en/latest/history.html#id33: @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Tinche"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7F4S4IeApbULXhkEZ0oab3Y7sk20Ag2fCYxsyi4WbWw="; + sha256 = "sha256-CKAsvRKS8kmLcyPA753mh6d3S04ObzO7xLPpmlmxrxI="; }; nativeBuildInputs = [ @@ -39,9 +39,9 @@ buildPythonPackage rec { ]; checkInputs = [ - bson hypothesis immutables + motor msgpack pytestCheckHook pyyaml @@ -59,6 +59,10 @@ buildPythonPackage rec { --replace "from orjson import loads as orjson_loads" "" ''; + preCheck = '' + export HOME=$(mktemp -d); + ''; + disabledTestPaths = [ # Don't run benchmarking tests "bench/test_attrs_collections.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix index dcfc6d8eca..d8e0af78e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.51.0"; + version = "0.53.0"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "v${version}"; - sha256 = "1027s243sik25c6sqw6gla7k7vl3jdicrik5zdsa8pafxh2baja4"; + sha256 = "sha256-UHcbbBoByoxW7+AUxu5mQmcvC3irHPQvBv4CbBXPTNo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix index d93737d8ad..dfdde6b0d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix @@ -1,41 +1,42 @@ { lib -, buildPythonPackage -, fetchPypi -, pythonOlder , attrs , botocore +, buildPythonPackage , click -, enum-compat +, fetchFromGitHub , hypothesis , inquirer , jmespath , mock , mypy-extensions , pip -, pytest +, pytestCheckHook +, pythonOlder , pyyaml +, requests , setuptools , six -, typing ? null +, typing , watchdog +, websocket-client , wheel }: buildPythonPackage rec { pname = "chalice"; - version = "1.23.0"; + version = "1.24.2"; - src = fetchPypi { - inherit pname version; - sha256 = "8e3b26f8ec15197d8c04cd1edb0d692a490cb5ec179560183a403de63f21c1d7"; + src = fetchFromGitHub { + owner = "aws"; + repo = pname; + rev = version; + sha256 = "0xpzc3rizdkjxclgxngswz0a22kdv1pw235gsw517ma7i06d0lw6"; }; - checkInputs = [ watchdog pytest hypothesis mock ]; propagatedBuildInputs = [ attrs botocore click - enum-compat inquirer jmespath mypy-extensions @@ -44,12 +45,18 @@ buildPythonPackage rec { setuptools six wheel - ] ++ lib.optionals (pythonOlder "3.5") [ + watchdog + ] ++ lib.optionals (pythonOlder "3.7") [ typing ]; - # conftest.py not included with pypi release - doCheck = false; + checkInputs = [ + hypothesis + mock + pytestCheckHook + requests + websocket-client + ]; postPatch = '' sed -i setup.py -e "/pip>=/c\'pip'," @@ -57,14 +64,35 @@ buildPythonPackage rec { --replace 'typing==3.6.4' 'typing' ''; - checkPhase = '' - pytest tests - ''; + disabledTestPaths = [ + # Don't check the templates and the sample app + "chalice/templates" + "docs/source/samples/todo-app/code/tests/test_db.py" + # Requires credentials + "tests/aws/test_features.py" + # Requires network access + "tests/aws/test_websockets.py" + "tests/integration/test_package.py" + ]; + + disabledTests = [ + # Requires network access + "test_update_domain_name_failed" + "test_can_reload_server" + # Content for the tests is missing + "test_can_import_env_vars" + "test_stack_trace_printed_on_error" + # Don't build + "test_can_generate_pipeline_for_all" + "test_build_wheel" + ]; + + pythonImportsCheck = [ "chalice" ]; meta = with lib; { description = "Python Serverless Microframework for AWS"; homepage = "https://github.com/aws/chalice"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix index 155b46d2c0..f85a9919a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.9438"; + version = "9.0.9506"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QgBdR2Xs3OscJ1PQ3fSwe0vqsKVSl2E7xf7JZ6B2FYA="; + sha256 = "sha256-wczwKTtOJ4VC3UZvd1KT6GfGUk5AS90ggLi2lFjhD+Q="; }; # Use upstream z3 implementation diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix index b29be9078d..37a2294934 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.9438"; + version = "9.0.9506"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BDhrKVnT1+zeEsQBM3qMDwcPJcePMPlAj/iL7M4GWtM="; + sha256 = "sha256-jTVccnCRqsp3EBl/RSKWVekAOsGhRvdIJxRyYV2gI4Q="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix new file mode 100644 index 0000000000..d99f66943d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix @@ -0,0 +1,55 @@ +{ lib +, boto3 +, botocore +, buildPythonPackage +, cached-property +, click +, click-option-group +, fetchFromGitHub +, jinja2 +, markdown +, policy-sentry +, pytestCheckHook +, pythonOlder +, pyyaml +, schema +}: + +buildPythonPackage rec { + pname = "cloudsplaining"; + version = "0.4.5"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "salesforce"; + repo = pname; + rev = version; + sha256 = "0s446jji3c9x1gw0lsb03giir91cnv6dgh4nzxg9mc1rm9wy7gzw"; + }; + + propagatedBuildInputs = [ + boto3 + botocore + cached-property + click + click-option-group + jinja2 + markdown + policy-sentry + pyyaml + schema + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "cloudsplaining" ]; + + meta = with lib; { + description = "Python module for AWS IAM security assessment"; + homepage = "https://github.com/salesforce/cloudsplaining"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix index dee6c2ab49..b5bbc88c34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; - postPatch = lib.optional stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' # Fake the impure dependencies pbpaste and pbcopy mkdir bin echo '#!${stdenv.shell}' > bin/pbpaste diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix index 9068814ffd..b7b5c7f55a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; # Required flags from https://github.com/cvxgrp/cvxpy/releases/tag/v1.1.11 - preBuild = lib.optional useOpenmp '' + preBuild = lib.optionalString useOpenmp '' export CFLAGS="-fopenmp" export LDFLAGS="-lgomp" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dateutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dateutil/default.nix index e71a532a80..d263414b4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dateutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dateutil/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "python-dateutil"; - version = "2.8.1"; + version = "2.8.2"; src = fetchPypi { inherit pname version; - sha256 = "73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"; + sha256 = "sha256-ASPKzBYnrhnd88J6XeW9Z+5FhvvdZEDZdI+Ku0g9PoY="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deemix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deemix/default.nix index bf9b226587..53cd0df833 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deemix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deemix/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "deemix"; - version = "3.4.2"; + version = "3.4.3"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kGE3JLMaDSQsz/b+vgQ5GGTp+itiqMymamaNO0NM2L0="; + sha256 = "sha256-cSLjbowG98pbEzGB17Rkhli90xeOyzOcEglXb5SeNJE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix index 1ae219e25c..46a4774e1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "deezer-py"; - version = "1.1.2"; + version = "1.1.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xkPbKFGULq5On13xuuV0Bqb5ATTXonH6mCPf3mwwv8A="; + sha256 = "sha256-FdLSJFALeGcecLAHk9khJTKlMd3Mec/w/PGQOHqxYMQ="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix index 30853aa41a..845993be71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "defcon"; - version = "0.8.1"; + version = "0.9.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1sj9yhwkyvzchglpy07pkx5362mwlap581ibv150b5l9s5mxn2j1"; + sha256 = "140f51da51e9630a9fa11dfd34376c4e29785fdb0bddc2e371df5b36bec17b76"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/detect-secrets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix similarity index 94% rename from third_party/nixpkgs/pkgs/development/tools/detect-secrets/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix index 5dc765ffe6..2e07f98d78 100644 --- a/third_party/nixpkgs/pkgs/development/tools/detect-secrets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix @@ -1,5 +1,5 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchFromGitHub , gibberish-detector , isPy27 @@ -12,7 +12,7 @@ , unidiff }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "detect-secrets"; version = "1.1.0"; disabled = isPy27; @@ -70,6 +70,6 @@ buildPythonApplication rec { description = "An enterprise friendly way of detecting and preventing secrets in code"; homepage = "https://github.com/Yelp/detect-secrets"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diagrams/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diagrams/default.nix index d34fc3b899..e015a6522d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diagrams/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diagrams/default.nix @@ -27,7 +27,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'jinja2 = "^2.10"' 'jinja2 = "*"' + --replace 'jinja2 = "^2.10"' 'jinja2 = "*"' \ + --replace 'graphviz = ">=0.13.2,<0.17.0"' 'graphviz = "*"' ''; preConfigure = '' @@ -35,7 +36,10 @@ buildPythonPackage rec { ./autogen.sh ''; - patches = [ ./build_poetry.patch ]; + patches = [ + # The build-system section is missing + ./build_poetry.patch + ]; checkInputs = [ pytestCheckHook ]; @@ -45,6 +49,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ graphviz ]; + pythonImportsCheck = [ "diagrams" ]; + meta = with lib; { description = "Diagram as Code"; homepage = "https://diagrams.mingrammer.com/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix index 6145b12662..54c3bf7cee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "django-ipware"; - version = "3.0.2"; + version = "3.0.7"; meta = { description = "A Django application to retrieve user's IP address"; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c7df8e1410a8e5d6b1fbae58728402ea59950f043c3582e033e866f0f0cf5e94"; + sha256 = "753f8214a16ccaac54ea977349a96e37b582a28a54065e00c1c46d530862c85e"; }; propagatedBuildInputs = [ django ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docopt-ng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docopt-ng/default.nix new file mode 100644 index 0000000000..7a18bfbc7c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/docopt-ng/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "docopt-ng"; + version = "0.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-hs7qAy8M+lnmB3brDPOKxzZTWBAihyMg9H3IdGeNckQ="; + }; + + pythonImportsCheck = [ "docopt" ]; + doCheck = false; # no tests in the package + + meta = with lib; { + description = "More-magic command line arguments parser. Now with more maintenance!"; + homepage = "https://github.com/bazaar-projects/docopt-ng"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dpkt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dpkt/default.nix index e252213605..74817e60cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dpkt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dpkt/default.nix @@ -1,14 +1,22 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib +, fetchPypi +, buildPythonPackage +}: buildPythonPackage rec { pname = "dpkt"; - version = "1.9.6"; + version = "1.9.7.1"; src = fetchPypi { inherit pname version; - sha256 = "b5737010fd420d142e02ed04fa616edd1fc05e414980baef594f72287c875eef"; + sha256 = "74899d557ec4e337db29cecc80548b23a1205384d30ee407397cfb9ab178e3d4"; }; + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "dpkt" ]; + meta = with lib; { description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols"; homepage = "https://github.com/kbandla/dpkt"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dsmr-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dsmr-parser/default.nix index 155927368e..1f59c95656 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dsmr-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dsmr-parser/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "dsmr-parser"; - version = "0.29"; + version = "0.30"; src = fetchFromGitHub { owner = "ndokter"; repo = "dsmr_parser"; rev = "v${version}"; - sha256 = "11d6cwmabzc8p6jkqwj72nrj7p6cxbvr0x3jdrxyx6zki8chyw4p"; + sha256 = "sha256-3RXku0L/XQFarECxY1LSs2TwSOlJAOiS6yEepHCGL5U="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix index 201813b2ec..db063747e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gcsfs"; - version = "2021.06.0"; + version = "2021.07.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - sha256 = "sha256-tJeCSGK24WC8E7NKupg6/Tv861idWg6WYir+ZXeU+e0="; + sha256 = "sha256-nC/uyhKKam3W+cOOTBULPeG6Hy2bExWYNOfDs1cPt1Y="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix index 698cd67bbc..c4c0f41d8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.9.0"; + version = "0.9.3"; src = fetchPypi { inherit pname version; - sha256 = "c32023bc2fb8fbb136f00a0e9c2feba21f3e1040af0f619c888661f6ee72dd28"; + sha256 = "56f969cf4ad6629ebcde73e807f7dac0a9375c79991b4f93efab191f37737a00"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geomet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geomet/default.nix index a4df450098..bace792ee8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geomet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geomet/default.nix @@ -1,31 +1,22 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , click , six }: buildPythonPackage rec { pname = "geomet"; - version = "0.2.1"; + version = "0.3.0"; # pypi tarball doesn't include tests src = fetchFromGitHub { owner = "geomet"; repo = "geomet"; rev = version; - sha256 = "0fdi26glsmrsyqk86rnsfcqw79svn2b0ikdv89pq98ihrpwhn85y"; + sha256 = "1lb0df78gkivsb7hy3ix0xccvcznvskip11hr5sgq5y76qnfc8p0"; }; - patches = [ - (fetchpatch { - name = "python-3.8-support.patch"; - url = "https://github.com/geomet/geomet/commit/dc4cb4a856d3ad814b57b4b7487d86d9e0f0fad4.patch"; - sha256 = "1f1cdfqyp3z01jdjvax77219l3gc75glywqrisqpd2k0m0g7fwh3"; - }) - ]; - propagatedBuildInputs = [ click six ]; meta = with lib; { 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 437417323f..4e1dbf8c46 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 @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.3.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/iTpO1Y+v//ZzaXUpOfBOXDRfftpmUV4hxsFmMj3tM0="; + sha256 = "bd1fe84efd2e45042d95c7e5713e0a0365ec8138df062c07fab761233202ab6f"; }; postPatch = '' 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 47af89d4be..6b3f607912 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 @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.7.0"; + version = "2.7.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-F4itJadl6oNJnY9EENTIugJll8uC20bS9yF/HCUlrWU="; + sha256 = "d52d386617c110c35043f6ff37ccb50d9f37c75b1e5586409ed64a3e8ae61038"; }; propagatedBuildInputs = [ 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 8e7953384e..a18872d562 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 @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.0.2"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5njC5yO7NTU81i9vmJoe1RBYPS1fU/3K5tgH7twyT+I="; + sha256 = "a88f21b7a110dc9b5fd8e5bc9c07330fafc9ef150921505250aec0f0b25cf5e8"; }; propagatedBuildInputs = [ google-api-core google-cloud-core grpc-google-iam-v1 proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gudhi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gudhi/default.nix new file mode 100644 index 0000000000..03b26927cf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/gudhi/default.nix @@ -0,0 +1,64 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, cmake +, boost +, eigen +, gmp +, cgal_5 # see https://github.com/NixOS/nixpkgs/pull/94875 about cgal +, mpfr +, tbb +, numpy +, cython +, pybind11 +, matplotlib +, scipy +, pytest +, enableTBB ? false +}: + +buildPythonPackage rec { + pname = "gudhi"; + version = "3.4.1"; + + src = fetchFromGitHub { + owner = "GUDHI"; + repo = "gudhi-devel"; + rev = "tags/gudhi-release-${version}"; + fetchSubmodules = true; + sha256 = "1m03qazzfraxn62l1cb11icjz4x8q2sg9c2k3syw5v0yv9ndgx1v"; + }; + + patches = [ ./remove_explicit_PYTHONPATH.patch ]; + + nativeBuildInputs = [ cmake numpy cython pybind11 matplotlib ]; + buildInputs = [ boost eigen gmp cgal_5 mpfr ] + ++ lib.optionals enableTBB [ tbb ]; + propagatedBuildInputs = [ numpy scipy ]; + checkInputs = [ pytest ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DWITH_GUDHI_PYTHON=ON" + "-DPython_ADDITIONAL_VERSIONS=3" + ]; + + preBuild = '' + cd src/python + ''; + + checkPhase = '' + rm -r gudhi + ${cmake}/bin/ctest --output-on-failure + ''; + + pythonImportsCheck = [ "gudhi" "gudhi.hera" "gudhi.point_cloud" "gudhi.clustering" ]; + + meta = { + description = "Library for Computational Topology and Topological Data Analysis (TDA)"; + homepage = "https://gudhi.inria.fr/python/latest/"; + downloadPage = "https://github.com/GUDHI/gudhi-devel"; + license = with lib.licenses; [ mit gpl3 ]; + maintainers = with lib.maintainers; [ yl3dy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gudhi/remove_explicit_PYTHONPATH.patch b/third_party/nixpkgs/pkgs/development/python-modules/gudhi/remove_explicit_PYTHONPATH.patch new file mode 100644 index 0000000000..da1bffb283 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/gudhi/remove_explicit_PYTHONPATH.patch @@ -0,0 +1,174 @@ +diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt +index 5c1402a..48a1250 100644 +--- a/src/python/CMakeLists.txt ++++ b/src/python/CMakeLists.txt +@@ -271,9 +271,6 @@ if(PYTHONINTERP_FOUND) + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/setup.py" "build_ext" "--inplace") + +- add_custom_target(python ALL DEPENDS gudhi.so +- COMMENT "Do not forget to add ${CMAKE_CURRENT_BINARY_DIR}/ to your PYTHONPATH before using examples or tests") +- + install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/setup.py install)") + + # Documentation generation is available through sphinx - requires all modules +@@ -295,14 +292,14 @@ if(PYTHONINTERP_FOUND) + # sphinx target requires gudhi.so, because conf.py reads gudhi version from it + add_custom_target(sphinx + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc +- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${SPHINX_PATH} -b html ${CMAKE_CURRENT_SOURCE_DIR}/doc ${CMAKE_CURRENT_BINARY_DIR}/sphinx + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/gudhi.so" + COMMENT "${GUDHI_SPHINX_MESSAGE}" VERBATIM) + + add_test(NAME sphinx_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${SPHINX_PATH} -b doctest ${CMAKE_CURRENT_SOURCE_DIR}/doc ${CMAKE_CURRENT_BINARY_DIR}/doctest) + + # Set missing or not modules +@@ -346,13 +343,13 @@ if(PYTHONINTERP_FOUND) + # Bottleneck and Alpha + add_test(NAME alpha_rips_persistence_bottleneck_distance_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_rips_persistence_bottleneck_distance.py" + -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -t 0.15 -d 3) + # Tangential + add_test(NAME tangential_complex_plain_homology_from_off_file_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/tangential_complex_plain_homology_from_off_file_example.py" + --no-diagram -i 2 -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off) + +@@ -361,13 +358,13 @@ if(PYTHONINTERP_FOUND) + # Witness complex + add_test(NAME euclidean_strong_witness_complex_diagram_persistence_from_off_file_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/euclidean_strong_witness_complex_diagram_persistence_from_off_file_example.py" + --no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -a 1.0 -n 20 -d 2) + + add_test(NAME euclidean_witness_complex_diagram_persistence_from_off_file_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/euclidean_witness_complex_diagram_persistence_from_off_file_example.py" + --no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -a 1.0 -n 20 -d 2) + +@@ -379,7 +376,7 @@ if(PYTHONINTERP_FOUND) + # Bottleneck + add_test(NAME bottleneck_basic_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/bottleneck_basic_example.py") + + if (PYBIND11_FOUND) +@@ -392,26 +389,26 @@ if(PYTHONINTERP_FOUND) + file(COPY ${CMAKE_SOURCE_DIR}/data/points/COIL_database/lucky_cat_PCA1 DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/) + add_test(NAME cover_complex_nerve_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/nerve_of_a_covering.py" + -f human.off -c 2 -r 10 -g 0.3) + + add_test(NAME cover_complex_coordinate_gic_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/coordinate_graph_induced_complex.py" + -f human.off -c 0 -v) + + add_test(NAME cover_complex_functional_gic_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/functional_graph_induced_complex.py" + -o lucky_cat.off + -f lucky_cat_PCA1 -v) + + add_test(NAME cover_complex_voronoi_gic_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/voronoi_graph_induced_complex.py" + -f human.off -n 700 -v) + +@@ -422,11 +419,11 @@ if(PYTHONINTERP_FOUND) + # Alpha + add_test(NAME alpha_complex_from_points_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_from_points_example.py") + add_test(NAME alpha_complex_diagram_persistence_from_off_file_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_diagram_persistence_from_off_file_example.py" + --no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -a 0.6) + add_gudhi_py_test(test_alpha_complex) +@@ -441,13 +438,13 @@ if(PYTHONINTERP_FOUND) + # Cubical + add_test(NAME periodic_cubical_complex_barcode_persistence_from_perseus_file_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/periodic_cubical_complex_barcode_persistence_from_perseus_file_example.py" + --no-barcode -f ${CMAKE_SOURCE_DIR}/data/bitmap/CubicalTwoSphere.txt) + + add_test(NAME random_cubical_complex_persistence_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/random_cubical_complex_persistence_example.py" + 10 10 10) + +@@ -456,19 +453,19 @@ if(PYTHONINTERP_FOUND) + # Rips + add_test(NAME rips_complex_diagram_persistence_from_distance_matrix_file_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/rips_complex_diagram_persistence_from_distance_matrix_file_example.py" + --no-diagram -f ${CMAKE_SOURCE_DIR}/data/distance_matrix/lower_triangular_distance_matrix.csv -e 12.0 -d 3) + + add_test(NAME rips_complex_diagram_persistence_from_off_file_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example/rips_complex_diagram_persistence_from_off_file_example.py + --no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -e 0.25 -d 3) + + add_test(NAME rips_complex_from_points_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example/rips_complex_from_points_example.py) + + add_gudhi_py_test(test_rips_complex) +@@ -476,7 +473,7 @@ if(PYTHONINTERP_FOUND) + # Simplex tree + add_test(NAME simplex_tree_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example/simplex_tree_example.py) + + add_gudhi_py_test(test_simplex_tree) +@@ -485,7 +482,7 @@ if(PYTHONINTERP_FOUND) + # Witness + add_test(NAME witness_complex_from_nearest_landmark_table_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example/witness_complex_from_nearest_landmark_table.py) + + add_gudhi_py_test(test_witness_complex) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix index 1bda1d8ac2..5bcfb64a18 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix @@ -2,38 +2,25 @@ , buildPythonPackage , fetchFromGitHub , numpy -, requests -, pyglet -, scipy -, pillow , cloudpickle }: buildPythonPackage rec { pname = "gym"; - version = "0.18.3"; + version = "0.19.0"; src = fetchFromGitHub { owner = "openai"; repo = pname; rev = version; - sha256 = "sha256-10KHUG6WacYzqna97vEhSQWDmJDvDmD5QxLhPW5NQSs="; + sha256 = "sha256-0O/s9OVNGQmeX9j8B1x63RxdI6dhqfTEJcgDH2jtCv4="; }; propagatedBuildInputs = [ cloudpickle numpy - pillow - pyglet - requests - scipy ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "Pillow<=8.2.0" "Pillow" - ''; - # The test needs MuJoCo that is not free library. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hijri-converter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hijri-converter/default.nix index e9ce708b2c..ce2acc33a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hijri-converter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hijri-converter/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hijri-converter"; - version = "2.1.3"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1cq67v0fjk7cd8kbppg2kl31a5i6jm8qrkcdqxx6vxwmx65l68ks"; + sha256 = "sha256-25pfMciEJUFjr2ocOb6ByAel6Je6lYdiTWcG3RBI8WA="; }; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hvplot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hvplot/default.nix index e0d2500bd5..271b392303 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hvplot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hvplot/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "hvplot"; - version = "0.7.2"; + version = "0.7.3"; src = fetchPypi { inherit pname version; - sha256 = "f0dcfcb5e46ae3c29a646c341435986e332ef38af1057bf7b76abadff0bbaca4"; + sha256 = "74b269c6e118dd6f7d2a4039e91f16a193638f4119b4358dc6dbd58a2e71e432"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/icecream/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/icecream/default.nix index b75d0d5d43..28fed3bcb7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/icecream/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/icecream/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "icecream"; - version = "2.1.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "c2e7b74c1c12caa2cfde050f2e636493ee77a9fb4a494b5593418ab359924a24"; + sha256 = "47e00e3f4e8477996e7dc420b6fa8ba53f8ced17de65320fedb5b15997b76589"; }; propagatedBuildInputs = [ asttokens colorama executing pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix index 5f94d61c7f..437c10c3d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.19.0"; + version = "1.20.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - sha256 = "0k1qcwd2qdw8mcr8ywy3wi1x9j6i57axgcps5kmkbx773s8qf155"; + sha256 = "sha256-VBKGzoLn71BQ5drbdiDjbpfHuYKGqHhuSwq0iNwdfh4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipyvuetify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipyvuetify/default.nix index 280ba747df..61fd8d269b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipyvuetify/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipyvuetify"; - version = "1.7.0"; + version = "1.8.1"; # GitHub version tries to run npm (Node JS) src = fetchPypi { inherit pname version; - sha256 = "ea951e3819fcfe8a2ba0a0fe8a51f07b01dca7986eaf57f1840b3c71848cc7c3"; + sha256 = "2d17367ce7da45a2622107d55c8b4c5475aace99ed5d95e5d7d3f93aa4c0c566"; }; propagatedBuildInputs = [ ipyvue ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix index e1efb9aa67..d50ad3a78a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "itemadapter"; - version = "0.2.0"; + version = "0.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "cb7aaa577fefe2aa6f229ccf4d058e05f44e0178a98c8fb70ee4d95acfabb423"; + sha256 = "ab2651ba20f5f6d0e15f041deba4c13ffc59270def2bd01518d13e94c4cd27d1"; }; doCheck = false; # infinite recursion with Scrapy @@ -18,6 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Common interface for data container classes"; homepage = "https://github.com/scrapy/itemadapter"; + changelog = "https://github.com/scrapy/itemadapter/raw/v${version}/Changelog.md"; license = licenses.bsd3; maintainers = [ maintainers.marsam ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix index 9f4b57ba89..436aad07bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jellyfish"; - version = "0.8.2"; + version = "0.8.8"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "02q3d9b933hf8lyvg7w7lgmhij8bjs748vjmsfxhabai04a796d4"; + sha256 = "0506089cacf9b5897442134417b04b3c6610c19f280ae535eace390dc6325a5c"; }; checkInputs = [ pytest unicodecsv ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jinja2-git/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jinja2-git/default.nix new file mode 100644 index 0000000000..59b34f6a4f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jinja2-git/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, jinja2 +, poetry-core +}: + +buildPythonPackage rec { + pname = "jinja2-git"; + version = "unstable-2021-07-20"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "wemake-services"; + repo = "jinja2-git"; + # this is master, we can't patch because of poetry.lock :( + # luckily, there appear to have been zero API changes since then, only + # dependency upgrades + rev = "c6d19b207eb6ac07182dc8fea35251d286c82512"; + sha256 = "0yw0318w57ksn8azmdyk3zmyzfhw0k281fddnxyf4115bx3aph0g"; + }; + + nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = [ jinja2 ]; + pythonImportsCheck = [ "jinja2_git" ]; + + meta = with lib; { + homepage = "https://github.com/wemake-services/jinja2-git"; + description = "Jinja2 extension to handle git-specific things"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix index 24d8ada589..a485bf3a60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix @@ -2,6 +2,8 @@ unidecode, mock, pytest , backports-shutil-which, configargparse, python-daemon, pymsgbox }: +# XXX: when changing this package, please test the package onlykey-agent. + buildPythonPackage rec { pname = "libagent"; version = "0.14.1"; 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 ad7d9b62bb..2dcea79fdc 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.10.3"; + version = "0.10.4"; src = fetchPypi { inherit pname version; - sha256 = "53d02ba86d53613833ca54ddad097ae048b2aa4f6e7a435a4de979d89abb8be0"; + sha256 = "ffbc4e29eb56089539b408f8e4c12a5d5a5d11d7fe7d40f8c6279784c618b869"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix index 31ce83512a..45e0c2d00a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "6.4.0"; + version = "6.5.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Dinnerbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pJ5TY9tbdhVW+kou+n5fMgCdHVBK6brBrlGIuO+VIK0="; + sha256 = "00xi3452lap4zx38msx89vvhrzkzb2dvwis1fcmx24qngj9g3yfr"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/md-toc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/md-toc/default.nix index e5321430dc..fcc102926b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/md-toc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/md-toc/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "md-toc"; - version = "8.0.0"; + version = "8.0.1"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "frnmst"; repo = pname; rev = version; - sha256 = "sha256-w5/oIeA9POth8bMszPH53RK1FM9PhmPdn4w9wxlqQ+g="; + sha256 = "sha256-nh9KxjwF+O4n0qVo9yPP6fvKB5XFICh+Ak6oD2fQVdk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/micawber/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/micawber/default.nix index 97681291a6..a7956241ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/micawber/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/micawber/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "micawber"; - version = "0.5.3"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "05ef4c89e307e3031dd1d85a3a557cd7f9f900f7dbbbcb33dde454940ca38460"; + sha256 = "003c5345aafe84f6b60fd289c003e8b1fef04c14e015c2d52d792a6b88135c89"; }; propagatedBuildInputs = [ beautifulsoup4 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/micloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/micloud/default.nix index 3b3bf44844..8fdc7910fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/micloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/micloud/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "micloud"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "Squachen"; repo = "micloud"; rev = "v_${version}"; - sha256 = "0267zyr79nfb5f9rwdwq3ym258yrpxx1b71xiqmszyz5s83mcixm"; + sha256 = "01z1qfln6f7pnxb4ssmyygyamnfgh36fzgn85s8axdwy8wrch20x"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix index 35e5e063bb..5285db9e71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix @@ -3,13 +3,13 @@ }: buildPythonPackage rec { pname = "netCDF4"; - version = "1.5.6"; + version = "1.5.7"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "7577f4656af8431b2fa6b6797acb45f81fa1890120e9123b3645e14765da5a7c"; + sha256 = "d145f9c12da29da3922d8b8aafea2a2a89501bcb28a219a46b7b828b57191594"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nplusone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nplusone/default.nix index 7d29428d93..d9a340d824 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nplusone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nplusone/default.nix @@ -1,6 +1,19 @@ -{ blinker, buildPythonPackage, fetchFromGitHub, lib, isPy27, six, mock, pytest -, webtest, pytest-cov, pytest-django, pytest-pythonpath, flake8, sqlalchemy -, flask_sqlalchemy, peewee }: +{ lib +, blinker +, buildPythonPackage +, fetchFromGitHub +, flake8 +, flask_sqlalchemy +, isPy27 +, mock +, peewee +, pytest-django +, pytest-pythonpath +, pytestCheckHook +, six +, sqlalchemy +, webtest +}: buildPythonPackage rec { pname = "nplusone"; @@ -14,6 +27,23 @@ buildPythonPackage rec { sha256 = "0qdwpvvg7dzmksz3vqkvb27n52lq5sa8i06m7idnj5xk2dgjkdxg"; }; + propagatedBuildInputs = [ + blinker + six + ]; + + checkInputs = [ + flake8 + flask_sqlalchemy + mock + peewee + pytest-django + pytest-pythonpath + pytestCheckHook + sqlalchemy + webtest + ]; + # The tests assume the source code is in an nplusone/ directory. When using # the Nix sandbox, it will be in a source/ directory instead, making the # tests fail. @@ -22,24 +52,29 @@ buildPythonPackage rec { --replace nplusone/tests/conftest source/tests/conftest ''; - checkPhase = '' - pytest tests/ + postPatch = '' + substituteInPlace pytest.ini \ + --replace "--cov nplusone --cov-report term-missing" "" ''; - propagatedBuildInputs = [ six blinker ]; - checkInputs = [ - mock - pytest - webtest - pytest-cov - pytest-django - pytest-pythonpath - flake8 - sqlalchemy - flask_sqlalchemy - peewee + disabledTests = [ + # Tests are out-dated + "test_many_to_one" + "test_many_to_many" + "test_eager_join" + "test_eager_subquery" + "test_eager_subquery_unused" + "test_many_to_many_raise" + "test_many_to_many_whitelist_decoy" + "test_many_to_one_subquery" + "test_many_to_one_reverse_subquery" + "test_many_to_many_subquery" + "test_many_to_many_reverse_subquery" + "test_profile" ]; + pythonImportsCheck = [ "nplusone" ]; + meta = with lib; { description = "Detecting the n+1 queries problem in Python"; homepage = "https://github.com/jmcarp/nplusone"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix index dc7ba5d8b6..33921406fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ntc-templates"; - version = "2.0.0"; + version = "2.2.2"; format = "pyproject"; disabled = isPy27; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "v${version}"; - sha256 = "05ifbzps9jxrrkrqybsdbm67jhynfcjc298pqkhp21q5jwnlrl72"; + sha256 = "1f2hmayj95j3fzkyh9qvl58z0l9j9mlsi8b2r9aa2fy753y5a73b"; }; nativeBuildInputs = [ 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 525f1a8bf9..26e1d73041 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.1"; + version = "0.9.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "63e75114131f704ff46ca2fe437fdae6429bfd9b4377e356253eb5dacc9e093a"; + sha256 = "3c23803671a3d920efa175af5828870bdff60ba2a3fcbf1d5b48bb81d68219c6"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix index 25e81c89c2..738f7fafca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "14.0.0"; + version = "14.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1zfcl3dq9ladqg7fnpx6kgxf1ckjzlc8v3j6wa8w6iwglm40ax4r"; + sha256 = "4baa02ff2c159cbba06f8d07fe11a6e624285ca2f813b1258b4c68766c0ee46b"; }; propagatedBuildInputs = [ @@ -36,12 +36,6 @@ buildPythonPackage rec { requests-mock ]; - postPatch = '' - # The constraint was removed. No longer needed for > 14.0.0 - # https://github.com/jupyterhub/oauthenticator/pull/431 - substituteInPlace test-requirements.txt --replace "pyjwt>=1.7,<2.0" "pyjwt" - ''; - disabledTests = [ # Test are outdated, https://github.com/jupyterhub/oauthenticator/issues/432 "test_azuread" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onlykey-solo-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onlykey-solo-python/default.nix new file mode 100644 index 0000000000..91f36b01dd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/onlykey-solo-python/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, click +, ecdsa +, fetchPypi +, fido2 +, intelhex +, lib +, pyserial +, pyusb +, requests +}: + +buildPythonPackage rec { + pname = "onlykey-solo-python"; + version = "0.0.28"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Mbi5So2OgeXjg4Fzg7v2gAJuh1Y7ZCYu8Lrha/7PQfY="; + }; + + propagatedBuildInputs = [ click ecdsa fido2 intelhex pyserial pyusb requests ]; + + # no tests + doCheck = false; + pythonImportsCheck = [ "solo" ]; + + meta = with lib; { + homepage = "https://github.com/trustcrypto/onlykey-solo-python"; + description = "Python library for OnlyKey with Solo FIDO2"; + maintainers = with maintainers; [ kalbasit ]; + license = licenses.asl20; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openapi-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openapi-core/default.nix index e41f7fd580..8e39c89968 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openapi-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openapi-core/default.nix @@ -17,6 +17,7 @@ , django , djangorestframework , responses +, mock }: buildPythonPackage rec { @@ -54,6 +55,7 @@ buildPythonPackage rec { django djangorestframework responses + mock ]; disabledTestPaths = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix index 43a319716e..c3c0538bf5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pdf2image"; - version = "1.15.1"; + version = "1.16.0"; propagatedBuildInputs = [ pillow poppler_utils ]; src = fetchPypi { inherit pname version; - sha256 = "aa6013c1b5b25ceb90caa34834f1ed343e969cfa532100e1472cfe0e96a639b5"; + sha256 = "d58ed94d978a70c73c2bb7fdf8acbaf2a7089c29ff8141be5f45433c0c4293bb"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix index 7f65b19bba..ea10276ae4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.42"; + version = "2.1.45"; src = fetchPypi { inherit pname version; - sha256 = "2deb088a3943891d07f9871e47409407e6308fbff3ee9514a0238791dc8da99f"; + sha256 = "e5b0de7b23e1f578f93559a08a01630481b0af3dc9fb3e130b14b99baa83491b"; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix index 51da889621..9ac877be88 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "6.1.0"; + version = "6.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QAv3finMpIwxq8IQBCkyu1LcwTjvTqTVLF20KaqK5u4="; + sha256 = "9ed38c73da4993e531694ea151f77048b4dbf2ba7b94c4a569daa39568cc6564"; }; LC_ALL = "en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix new file mode 100644 index 0000000000..90eb35f993 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix @@ -0,0 +1,44 @@ +{ lib +, appdirs +, buildPythonPackage +, fetchFromGitHub +, platformdirs +, pytest-mock +, pytestCheckHook +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "platformdirs"; + version = "2.2.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "15f08czqfmxy1y947rlrsjs20jgsy2vc1wqhv4b08b3ijxj0jpqh"; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + checkInputs = [ + appdirs + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "platformdirs" ]; + + meta = with lib; { + description = "Python module for determining appropriate platform-specific directories"; + homepage = "https://platformdirs.readthedocs.io/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix new file mode 100644 index 0000000000..8240e86af2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix @@ -0,0 +1,45 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, click +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, schema +}: + +buildPythonPackage rec { + pname = "policy-sentry"; + version = "0.11.16"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "salesforce"; + repo = "policy_sentry"; + rev = version; + sha256 = "0m3sr1mhnmm22xgd3h9dgkrq20pdghwx505xld4pahj686z4bva2"; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + click + requests + pyyaml + schema + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "policy_sentry" ]; + + meta = with lib; { + description = "Python module for generating IAM least privilege policies"; + homepage = "https://github.com/salesforce/policy_sentry"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/policyuniverse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/policyuniverse/default.nix new file mode 100644 index 0000000000..3c3c318efc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/policyuniverse/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "policyuniverse"; + version = "1.4.0.20210816"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "05fxn89f6rr5rrp117cnqsfzy1p3nbmq3izq2jqk6kackcr3cl8x"; + }; + + # Tests are not shipped and there are no GitHub tags + doCheck = false; + + pythonImportsCheck = [ "policyuniverse" ]; + + meta = with lib; { + description = "Parse and Process AWS IAM Policies, Statements, ARNs and wildcards"; + homepage = "https://github.com/Netflix-Skunkworks/policyuniverse"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pot/default.nix new file mode 100644 index 0000000000..431c2e4048 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pot/default.nix @@ -0,0 +1,55 @@ +{ lib +, fetchPypi +, buildPythonPackage +, numpy +, scipy +, cython +, matplotlib +, scikit-learn +, cupy +, pymanopt +, autograd +, pytestCheckHook +, enableDimensionalityReduction ? false +, enableGPU ? false +}: + +buildPythonPackage rec { + pname = "pot"; + version = "0.7.0"; + + src = fetchPypi { + pname = "POT"; + inherit version; + sha256 = "01mdsiv8rlgqzvm3bds9aj49khnn33i523c2cqqrl10zg742pb6l"; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-report= --cov=ot" "" + ''; + + nativeBuildInputs = [ numpy cython ]; + propagatedBuildInputs = [ numpy scipy ] + ++ lib.optionals enableGPU [ cupy ] + ++ lib.optionals enableDimensionalityReduction [ pymanopt autograd ]; + checkInputs = [ matplotlib scikit-learn pytestCheckHook ]; + + # To prevent importing of an incomplete package from the build directory + # instead of nix store (`ot` is the top-level package name). + preCheck = '' + rm -r ot + ''; + + # GPU tests are always skipped because of sandboxing + disabledTests = [ "warnings" ]; + + pythonImportsCheck = [ "ot" "ot.lp" ]; + + meta = { + description = "Python Optimal Transport Library"; + homepage = "https://pythonot.github.io/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ yl3dy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ptpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ptpython/default.nix index 2e8bde6f53..f6befe1bd6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ptpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ptpython/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "ptpython"; - version = "3.0.17"; + version = "3.0.19"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "911d25cca31a8e4f9b2ecd16dcdad793b8859e94fca1275f3485d8cdf20b13de"; + sha256 = "b3d41ce7c2ce0e7e55051347eae400fc56b9b42b1c4a9db25b19ccf6195bfc12"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pulp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pulp/default.nix index 3e4c4b4b66..2b12c16135 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pulp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pulp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "PuLP"; - version = "2.4"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "b2aff10989b3692e3a59301a0cb0acddeb25dcea378f8804c86007075eae55b5"; + sha256 = "5dc7d76bfb1da06ac048066ced75603340d0d7ba8a7dbfce4040d6f126eda0d5"; }; propagatedBuildInputs = [ pyparsing amply ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py3status/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py3status/default.nix index 1471d7b173..c8d5068e4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py3status/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.37"; + version = "3.38"; src = fetchPypi { inherit pname version; - sha256 = "e05fe64df57de0f86e9b1aca907cd6f080d85909085e594868af488ce3557809"; + sha256 = "5660163a91590f320685263a738ab910c7a86346d9c85a68639a19ab83433ce6"; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix index 0fe3998b3e..0dbcdfbc26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix @@ -3,16 +3,18 @@ , buildPythonPackage , setuptools-scm , cython +, pytestCheckHook +, unittest2 }: buildPythonPackage rec { pname = "pyclipper"; - version = "1.2.1"; + version = "1.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ca3751e93559f0438969c46f17459d07f983281dac170c3479de56492e152855"; + sha256 = "48a1b5c585aea10e5b9c0b82d6abe2642fafd9ef158b9921852bc4af815ca20c"; }; nativeBuildInputs = [ @@ -20,10 +22,7 @@ buildPythonPackage rec { cython ]; - # Requires pytest_runner to perform tests, which requires deprecated - # features of setuptools. Seems better to not run tests. This should - # be fixed upstream. - doCheck = false; + checkInputs = [ pytestCheckHook unittest2 ]; pythonImportsCheck = [ "pyclipper" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix index 614393cf2d..c8cc7c9642 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix @@ -1,8 +1,8 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, matplotlib, numpy, pytest, seaborn }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, matplotlib, numpy, pytestCheckHook, seaborn }: buildPythonPackage rec { pname = "pycm"; - version = "3.1"; + version = "3.2"; disabled = !isPy3k; @@ -10,22 +10,20 @@ buildPythonPackage rec { owner = "sepandhaghighi"; repo = pname; rev = "v${version}"; - sha256 = "1aspd3vkjasb4wxs9czwjw42fmd4027wsmm4vlj09yp7sl57gary"; + sha256 = "1p2scgb4aghjlxak4zvm3s9ydkpg42mdxy6vjxlnqw0wpnsskfni"; }; # remove a trivial dependency on the author's `art` Python ASCII art library postPatch = '' rm pycm/__main__.py + rm Otherfiles/notebook_check.py # also depends on python3Packages.notebook substituteInPlace setup.py --replace '=get_requires()' '=[]' ''; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; + disabledTests = [ "pycm.pycm_compare.Compare" ]; # output formatting error propagatedBuildInputs = [ matplotlib numpy seaborn ]; - checkPhase = '' - pytest Test/ - ''; - meta = with lib; { description = "Multiclass confusion matrix library"; homepage = "https://pycm.ir"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfronius/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfronius/default.nix index 5b5016649a..5ad12130fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfronius/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfronius/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyfronius"; - version = "0.5.3"; + version = "0.6.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "nielstron"; repo = pname; - rev = version; - sha256 = "sha256-AtCpraIYNrEkTygtLMivrXfKCKVKIIUCDo3GYFpg8fk="; + rev = "release-${version}"; + sha256 = "03szfgf2g0hs4r92p8jb8alzl7byzrirxsa25630zygmkadzgrz2"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix index bcdce070c6..7ae4c96702 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchPypi, buildPythonPackage, python, pkg-config, libX11 -, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, libpng, libjpeg, portmidi, freetype -, fontconfig +{ stdenv, lib, substituteAll, fetchPypi, buildPythonPackage, python, pkg-config, libX11 +, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, libpng, libjpeg, portmidi, freetype, fontconfig +, AppKit, CoreMIDI }: buildPythonPackage rec { @@ -12,6 +12,27 @@ buildPythonPackage rec { sha256 = "8b1e7b63f47aafcdd8849933b206778747ef1802bd3d526aca45ed77141e4001"; }; + patches = [ + # Patch pygame's dependency resolution to let it find build inputs + (substituteAll { + src = ./fix-dependency-finding.patch; + buildinputs_include = builtins.toJSON (builtins.concatMap (dep: [ + "${lib.getDev dep}/" + "${lib.getDev dep}/include" + ]) buildInputs); + buildinputs_lib = builtins.toJSON (builtins.concatMap (dep: [ + "${lib.getLib dep}/" + "${lib.getLib dep}/lib" + ]) buildInputs); + }) + ]; + + postPatch = '' + substituteInPlace src_py/sysfont.py \ + --replace 'path="fc-list"' 'path="${fontconfig}/bin/fc-list"' \ + --replace /usr/X11/bin/fc-list ${fontconfig}/bin/fc-list + ''; + nativeBuildInputs = [ pkg-config SDL2 ]; @@ -19,37 +40,33 @@ buildPythonPackage rec { buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf libpng libjpeg portmidi libX11 freetype + ] ++ lib.optionals stdenv.isDarwin [ + AppKit CoreMIDI ]; preConfigure = '' - sed \ - -e "s/origincdirs = .*/origincdirs = []/" \ - -e "s/origlibdirs = .*/origlibdirs = []/" \ - -e "/linux-gnu/d" \ - -i buildconfig/config_unix.py - ${lib.concatMapStrings (dep: '' - sed \ - -e "/origincdirs =/a\ origincdirs += ['${lib.getDev dep}/include']" \ - -e "/origlibdirs =/a\ origlibdirs += ['${lib.getLib dep}/lib']" \ - -i buildconfig/config_unix.py - '') buildInputs - } LOCALBASE=/ ${python.interpreter} buildconfig/config.py ''; - checkInputs = [ fontconfig ]; + checkPhase = '' + runHook preCheck - preCheck = '' # No audio or video device in test environment export SDL_VIDEODRIVER=dummy export SDL_AUDIODRIVER=disk export SDL_DISKAUDIOFILE=/dev/null + + ${python.interpreter} -m pygame.tests -v --exclude opengl,timing --time_out 300 + + runHook postCheck ''; + pythonImportsCheck = [ "pygame" ]; meta = with lib; { description = "Python library for games"; homepage = "https://www.pygame.org/"; license = licenses.lgpl21Plus; - platforms = platforms.linux; + maintainers = with maintainers; [ angustrau ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame/fix-dependency-finding.patch b/third_party/nixpkgs/pkgs/development/python-modules/pygame/fix-dependency-finding.patch new file mode 100644 index 0000000000..11b705f1b1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame/fix-dependency-finding.patch @@ -0,0 +1,64 @@ +diff --git a/buildconfig/config_darwin.py b/buildconfig/config_darwin.py +index 8d84683f..70df8f9c 100644 +--- a/buildconfig/config_darwin.py ++++ b/buildconfig/config_darwin.py +@@ -56,10 +56,10 @@ class Dependency: + class FrameworkDependency(Dependency): + def configure(self, incdirs, libdirs): + BASE_DIRS = '/', os.path.expanduser('~/'), '/System/' +- for n in BASE_DIRS: ++ for n in incdirs + libdirs: + n += 'Library/Frameworks/' + fmwk = n + self.libs + '.framework/Versions/Current/' +- if os.path.isfile(fmwk + self.libs): ++ if os.path.isfile(fmwk + self.libs + '.tbd'): + print ('Framework ' + self.libs + ' found') + self.found = 1 + self.inc_dir = fmwk + 'Headers' +@@ -158,19 +158,8 @@ def main(sdl2=False): + ]) + + print ('Hunting dependencies...') +- incdirs = ['/usr/local/include'] +- if sdl2: +- incdirs.append('/usr/local/include/SDL2') +- else: +- incdirs.append('/usr/local/include/SDL') +- +- incdirs.extend([ +- #'/usr/X11/include', +- '/opt/local/include', +- '/opt/local/include/freetype2/freetype'] +- ) +- #libdirs = ['/usr/local/lib', '/usr/X11/lib', '/opt/local/lib'] +- libdirs = ['/usr/local/lib', '/opt/local/lib'] ++ incdirs = @buildinputs_include@ ++ libdirs = @buildinputs_lib@ + + for d in DEPS: + if isinstance(d, (list, tuple)): +diff --git a/buildconfig/config_unix.py b/buildconfig/config_unix.py +index f6a4ea4b..f7f5be76 100644 +--- a/buildconfig/config_unix.py ++++ b/buildconfig/config_unix.py +@@ -224,18 +224,8 @@ def main(sdl2=False): + if not DEPS[0].found: + raise RuntimeError('Unable to run "sdl-config". Please make sure a development version of SDL is installed.') + +- incdirs = [] +- libdirs = [] +- for extrabase in extrabases: +- incdirs += [extrabase + d for d in origincdirs] +- libdirs += [extrabase + d for d in origlibdirs] +- incdirs += ["/usr"+d for d in origincdirs] +- libdirs += ["/usr"+d for d in origlibdirs] +- incdirs += ["/usr/local"+d for d in origincdirs] +- libdirs += ["/usr/local"+d for d in origlibdirs] +- if localbase: +- incdirs = [localbase+d for d in origincdirs] +- libdirs = [localbase+d for d in origlibdirs] ++ incdirs = @buildinputs_include@ ++ libdirs = @buildinputs_lib@ + + for arg in DEPS[0].cflags.split(): + if arg[:2] == '-I': diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix index 4d9538dbc3..1ec0c6a97b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.6.0"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "7aacea4e57011777f4774421228e5d0ddb9a6ddb87ac4b542346d17ab12a4d62"; + sha256 = "c3303776f774d3e0115c1c4f6e1fc35470d15f113a7ae9401a0b90acfa1661ac"; }; preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyglet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyglet/default.nix index 1bb36d6029..b530dfe0b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyglet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyglet/default.nix @@ -1,26 +1,31 @@ { lib, stdenv , buildPythonPackage , fetchPypi +, unzip +, pythonOlder , libGL , libGLU , xorg -, future -, pytest +, pytestCheckHook , glibc , gtk2-x11 , gdk-pixbuf , fontconfig , freetype , ffmpeg-full +, openal +, libpulseaudio }: buildPythonPackage rec { - version = "1.4.2"; + version = "1.5.19"; pname = "pyglet"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1dxxrl4nc7xh3aai1clgzvk48bvd35r7ksirsddz0mwhx7jmm8px"; + sha256 = "sha256-/kuh2RboWWoOs4KX0PyhNlYgKI8q2SyiWvMJvprg/8w="; + extension = "zip"; }; # find_library doesn't reliably work with nix (https://github.com/NixOS/nixpkgs/issues/7307). @@ -37,6 +42,8 @@ buildPythonPackage rec { path = None if name == 'GL': path = '${libGL}/lib/libGL${ext}' + elif name == 'EGL': + path = '${libGL}/lib/libEGL${ext}' elif name == 'GLU': path = '${libGLU}/lib/libGLU${ext}' elif name == 'c': @@ -55,26 +62,46 @@ buildPythonPackage rec { path = '${freetype}/lib/libfreetype${ext}' elif name[0:2] == 'av' or name[0:2] == 'sw': path = '${ffmpeg-full}/lib/lib' + name + '${ext}' + elif name == 'openal': + path = '${openal}/lib/libopenal${ext}' + elif name == 'pulse': + path = '${libpulseaudio}/lib/libpulse${ext}' + elif name == 'Xi': + path = '${xorg.libXi}/lib/libXi${ext}' + elif name == 'Xinerama': + path = '${xorg.libXinerama}/lib/libXinerama${ext}' + elif name == 'Xxf86vm': + path = '${xorg.libXxf86vm}/lib/libXxf86vm${ext}' if path is not None: return ctypes.cdll.LoadLibrary(path) raise Exception("Could not load library {}".format(names)) EOF ''; - propagatedBuildInputs = [ future ]; + nativeBuildInputs = [ unzip ]; - # needs an X server. Keep an eye on - # https://bitbucket.org/pyglet/pyglet/issues/219/egl-support-headless-rendering + # needs GL set up which isn't really possible in a build environment even in headless mode. + # tests do run and pass in nix-shell, however. doCheck = false; checkInputs = [ - pytest + pytestCheckHook ]; - checkPhase = '' - py.test tests/unit tests/integration + preCheck = '' + export PYGLET_HEADLESS=True ''; + # test list taken from .travis.yml + disabledTestPaths = [ + "tests/base" + "tests/interactive" + "tests/integration" + "tests/unit/text/test_layout.py" + ]; + + pythonImportsCheck = [ "pyglet" ]; + meta = with lib; { homepage = "http://www.pyglet.org/"; description = "A cross-platform windowing and multimedia library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix new file mode 100644 index 0000000000..8b1c4f2fd4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix @@ -0,0 +1,39 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, numpy +, scipy +, autograd +, nose2 +}: + +buildPythonPackage rec { + pname = "pymanopt"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "0zk775v281375sangc5qkwrkb8yc9wx1g8b1917s4s8wszzkp8k6"; + }; + + propagatedBuildInputs = [ numpy scipy ]; + checkInputs = [ nose2 autograd ]; + + checkPhase = '' + # nose2 doesn't properly support excludes + rm tests/test_{problem,tensorflow,theano}.py + + nose2 tests -v + ''; + + pythonImportsCheck = [ "pymanopt" ]; + + meta = { + description = "Python toolbox for optimization on Riemannian manifolds with support for automatic differentiation"; + homepage = "https://www.pymanopt.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ yl3dy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix index 4ee22feed1..216e248867 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pymunk"; - version = "6.0.0"; + version = "6.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "04jqqd2y0wzzkqppbl08vyzgbcpl5qj946w8da2ilypqdx7j2akp"; + sha256 = "1k1ncrssywvfrbmai7d20h2mg4lzhq16rhw3dkg4ad5nhik3k0sl"; }; propagatedBuildInputs = [ cffi ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix index 5237ce9955..b59d292d97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "5.0.3"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "01741df673abb518d5cf9f00223a227f5d0ab9e0a6b19e444ceb38d497019f31"; + sha256 = "7f351d70b9f4da95ea2d7e50299640e4c46c83b7b24bea5daf110acd2e5aef2b"; }; propagatedBuildInputs = [ python-dateutil botocore ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix index 8f2686a791..08ee6db35e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "4.0.30"; + version = "4.0.31"; disabled = isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - sha256 = "0skjpraar6hcwsy82612bpj8nw016ncyvvq88j5syrikxgp5saw5"; + sha256 = "89256e79d23415887cacf0a821f9f94baa5d833080521d456687d5e88c40c226"; }; buildInputs = [ unixODBC ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix index 96f0ba057f..c8a9775dd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix @@ -2,12 +2,12 @@ , graphviz, networkx, six, opt-einsum, tqdm, pyro-api }: buildPythonPackage rec { - version = "1.6.0"; + version = "1.7.0"; pname = "pyro-ppl"; src = fetchPypi { inherit version pname; - sha256 = "ee181852713058f59d600dfa2e05bbc6f7f9b88fcdb4d2f1ccf61b0bf4794088"; + sha256 = "a8ec6968fdfa34f140584b266099238f1ffeacbbaab3775de5c94c0e685d018a"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix index 5de5ad3a0d..6eeb10b6dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysaml2"; - version = "6.5.2"; + version = "7.0.1"; disabled = !isPy3k; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "IdentityPython"; repo = pname; rev = "v${version}"; - sha256 = "1p0i88v2ng9fzs0fzjam1dc1idnihqc1wgagvnavqjrih721qcpi"; + sha256 = "0ickqask6bjipgi3pvxg92pjr6dk2rr3q9garap39mdrp2gsfhln"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix index 3ca096332a..8fbd0801dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyscreenshot"; - version = "2.3"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "bfdc311bd6ec1ee9e3c25ece75b24a749673ad5d5f89ee02950080023054ffd5"; + sha256 = "dd4fdfaeb617483913a6b16845b9f428de5db28758979f4b6cf8f236d292b908"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix index 981860c7a6..f6736a736c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix @@ -10,11 +10,13 @@ , pytest-openfiles , pytest-arraydiff , setuptools-scm +, pythonOlder }: buildPythonPackage rec { pname = "pytest-astropy"; version = "0.8.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; @@ -25,7 +27,9 @@ buildPythonPackage rec { setuptools-scm ]; - buildInputs = [ pytest ]; + buildInputs = [ + pytest + ]; propagatedBuildInputs = [ hypothesis @@ -38,12 +42,15 @@ buildPythonPackage rec { ]; # pytest-astropy is a meta package and has no tests - doCheck = false; + #doCheck = false; + checkPhase = '' + # 'doCheck = false;' still invokes the pytestCheckPhase which makes the build fail + ''; meta = with lib; { description = "Meta-package containing dependencies for testing"; homepage = "https://astropy.org"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix index 1773a4b579..6e7fd37b91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "Colin-b"; repo = "pytest_httpx"; rev = "v${version}"; - sha256 = "sha256-Awhsm8jmoCZTBnfrrauLxAEKtpxTzjPMXmx7HR0f/g4="; + sha256 = "sha256-eyR0h0fW5a+L6QslTnM0TPvQCto06aMcKCE+b8LqHcQ="; }; buildInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix index 05f632d39b..0371b7cac5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix @@ -1,20 +1,29 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch +, poetry-core , pytest +, pythonOlder }: buildPythonPackage rec { pname = "pytest-socket"; - version = "0.3.3"; + version = "0.4.0"; + disabled = pythonOlder "3.6"; + format = "pyproject"; src = fetchFromGitHub { owner = "miketheman"; repo = pname; rev = version; - sha256 = "1jbzkyp4xki81h01yl4vg3nrg9b6shsk1ryrmkaslffyhrqnj8zh"; + sha256 = "sha256-cFYtJqZ/RjFbn9XlEy6ffxZ2djisajQAwjV/YR2f59Q="; }; + nativeBuildInputs = [ + poetry-core + ]; + buildInputs = [ pytest ]; @@ -23,18 +32,24 @@ buildPythonPackage rec { pytest ]; - checkPhase = '' - pytest - ''; + patches = [ + # Switch to poetry-core, https://github.com/miketheman/pytest-socket/pull/74 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/miketheman/pytest-socket/commit/32519170e656e731d24b81770a170333d3efa6a8.patch"; + sha256 = "19ksgx77rsa6ijcbml74alwc5052mdqr4rmvqhlzvfcvv3676ig2"; + }) + ]; - # unsurprisingly pytest-socket require network for majority of tests - # to pass... + # pytest-socket require network for majority of tests doCheck = false; + pythonImportsCheck = [ "pytest_socket" ]; + meta = with lib; { description = "Pytest Plugin to disable socket calls during tests"; homepage = "https://github.com/miketheman/pytest-socket"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix index fa63cc035a..d7b0b660be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "1.1.1"; + version = "1.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c8810f991545e352f646fb382e5962ff54b8aa52b09d62d35ae04f0d7a9c58d9"; + sha256 = "91f4513f7e5a1cf4f1eda25ab7f310497abe30e5f19b612fd80ba7d5f60b58a6"; }; propagatedBuildInputs = [ coverage ]; 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 f3a3672e65..d61512bd6b 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.2.2"; + version = "3.2.3"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "gammu"; repo = pname; rev = version; - sha256 = "sha256-HFI4LBrVf+kBoZfdZrZL1ty9N5DxZ2SOvhiIAFVxqaI="; + sha256 = "sha256-MtFxKRE6CB/LZq9McMyYhjwfs/Rdke9gsNUqbOQdWYQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix index 9c6b8c31e1..c1a2de0a07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.2.0"; + version = "1.2.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python-lsp"; repo = pname; rev = "v${version}"; - sha256 = "09wnnbf7lqqni6xkpzzk7nmcqjm5bx49xqzmp5fkb9jk50ivcrdz"; + sha256 = "sha256-TyXKlXeXMyq+bQq9ngDm0SuW+rAhDlOVlC3mDI1THwk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix index 411aa23254..f5b338680b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.23.3"; + version = "2.24.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z17Bs3Mr1PJ9bYP2vsXTaJ85jOoIIlKLWR6D6s7enFs="; + sha256 = "sha256-vWju0D5O3RtDiv9uYQqd9kEwTIcV9QTHYXM/icB/rM0="; }; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index 716afd52ca..fee0653d5e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.9438"; + version = "9.0.9506"; src = fetchPypi { inherit pname version; - sha256 = "sha256-L7Y80qWecmAP9aBuUh1YMBNhvLGPJUfj80mdEbhzC9Y="; + sha256 = "sha256-DseMX41dXmmt44SPVHSIFRIJL1u9yZ3kq8pv8TzC/OQ="; }; postPatch = lib.optionalString stdenv.isDarwin '' 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 ed7a83bdae..6da6b78038 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.7"; + version = "2.7.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "0hsmn3irixrgmd04pm0f89gn44fdn2nkcp92x7gc2kncwkval6hc"; + sha256 = "sha256-YczzB95RyOdRGEye1pUqCZxegtp6kjCtUUHYyHD0WP0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix index 80d69a0433..878611d8e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pywemo"; - version = "0.6.6"; + version = "0.6.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "04h4av65x0a2iv3a4rpsq19m9pi7wk8j447rr5z7jwap870gs8nd"; + sha256 = "sha256-g3/xMCCCsn2EY1DsRuZAcfUIsdkP3mEkYlI+KjYKXOk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix index 29f2ab4960..72f75e7a13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "qrcode"; - version = "6.1"; + version = "7.3"; src = fetchPypi { inherit pname version; - sha256 = "505253854f607f2abf4d16092c61d4e9d511a3b4392e60bff957a68592b04369"; + sha256 = "d72861b65e26b611609f0547f0febe58aed8ae229d6bf4e675834f40742915b3"; }; propagatedBuildInputs = [ six pillow pymaging_png setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/quantities/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quantities/default.nix index ca6d8f0cfd..233eb8a44b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/quantities/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/quantities/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "quantities"; - version = "0.12.4"; + version = "0.12.5"; src = fetchPypi { inherit pname version; - sha256 = "12qx6cgib3wxmm2cvann4zw4jnhhn24ms61ifq9f3jbh31nn6gd3"; + sha256 = "67546963cb2a519b1a4aa43d132ef754360268e5d551b43dd1716903d99812f0"; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix index 01b9d0fd09..787e9a6e27 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "0.7.3"; + version = "0.7.4"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "reclosedev"; repo = "requests-cache"; rev = "v${version}"; - sha256 = "sha256-QGh/ThI5bKE65luVHDSsr6RQq5RReugdZrVvR1R0pUU="; + sha256 = "sha256-FndKFdmEsp3TF2W4b7nhARi9ZOutlE43vvzYxiwbL08="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix index 29d7b85f9e..9ebfaa77da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "requests-pkcs12"; - version = "1.10"; + version = "1.12"; src = fetchFromGitHub { owner = "m-click"; repo = "requests_pkcs12"; rev = version; - sha256 = "sha256-HIUCzHxOsbk1OmcxkRK9GQ+SZ6Uf1xDylOe2pUYz3Hk="; + sha256 = "sha256-fMmca3QNr9UBpSHcVf0nHmGmvkW99bnmigHcWj0D2g0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix index 449af6d089..749c7815fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "robotframework"; - version = "4.0.3"; + version = "4.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1wqz7szbq2g3kkm7frwik4jb5m7517306sz8nxx8hxaw4n6y1i5d"; + sha256 = "09k008252x3l4agl9f8ai4a9mn0dp3m5s81mp1hnsf0hribb0s96"; }; checkInputs = [ jsonschema ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sacn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sacn/default.nix index e4e14bc93e..ff432f6f3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sacn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sacn/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "sacn"; - version = "1.7.0"; + version = "1.8.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "136gw09av7r2y02q7aam4chhivpbwkdskwwavrl5v0zn34y0axwp"; + sha256 = "cdc9af732f4ca5badbf732499775575c4f815c73f857720c0a61a3fc80257f7a"; }; # no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix index b61d8e9699..2b16b99bea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.46.0"; + version = "2.54.0"; src = fetchPypi { inherit pname version; - sha256 = "4f66f8c56b870e7a6f9a3882790a4074f2df26a0fe9605bc5d71e186db193525"; + sha256 = "sha256-uLsBHqzpcuTugRXBihdbib64l396m+os39OhP+tLLCM="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix index 19fa8e5072..7a9643aa7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix @@ -1,4 +1,15 @@ -{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, pytest-xdist, numpy, pybind11 }: +{ lib +, stdenv +, fetchPypi +, python +, buildPythonPackage +, gfortran +, nose +, pytest +, pytest-xdist +, numpy +, pybind11 +}: buildPythonPackage rec { pname = "scipy"; @@ -30,6 +41,17 @@ buildPythonPackage rec { ln -s ${numpy.cfg} site.cfg ''; + + # disable stackprotector on aarch64-darwin for now + # + # build error: + # + # /private/tmp/nix-build-python3.9-scipy-1.6.3.drv-0/ccDEsw5U.s:109:15: error: index must be an integer in range [-256, 255]. + # + # ldr x0, [x0, ___stack_chk_guard];momd + # + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + checkPhase = '' runHook preCheck pushd dist 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 fcf0cdd06d..f121ac9aeb 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 @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.9.0"; + version = "3.9.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-9iV/l2eX4WB8PkTz+bMJIshdD/Q3K0ig8hIK9R8S/oM="; + sha256 = "sha256-IskBFccMDG03BFkERRfL7TH1Ppq8Xr9qTxCEoUEqxtk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smart-open/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smart-open/default.nix index d4ad901fb9..5e86281642 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smart-open/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smart-open/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "smart-open"; - version = "5.1.0"; + version = "5.2.0"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "RaRe-Technologies"; repo = "smart_open"; rev = "v${version}"; - sha256 = "0gv3vxpglnhh6d80wsqigxi7psn6s7ylz20kx5ahblcx5rqyhjmi"; + sha256 = "sha256-eC9BYHeACzGp382QBNgLcNMYDkHi0WXyEj/Re9ShXuA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix index f0ec10fafb..ef0bb8a071 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix @@ -1,43 +1,55 @@ { lib , buildPythonPackage -, fetchFromGitHub -, isPy27 -, ptable , click -, requests -, prompt-toolkit -, pygments -, urllib3 -, pytest -, pytest-cov +, fetchFromGitHub , mock +, prompt-toolkit +, ptable +, pygments +, pytestCheckHook +, pythonOlder +, requests , sphinx , testtools +, tkinter +, urllib3 }: buildPythonPackage rec { - pname = "softlayer-python"; - version = "5.8.4"; - disabled = isPy27; - - propagatedBuildInputs = [ ptable click requests prompt-toolkit pygments urllib3 ]; - - checkInputs = [ pytest pytest-cov mock sphinx testtools ]; - - checkPhase = '' - pytest - ''; + pname = "softlayer"; + version = "5.9.7"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { - owner = "softlayer"; - repo = pname; + owner = pname; + repo = "softlayer-python"; rev = "v${version}"; - sha256 = "10kzi7kvvifr21a46q2xqsibs0bx5ys22nfym0bg605ka37vcz88"; + sha256 = "0zwhykrpckx3ln4w6vlgp0nrkkr8343ni1w43hxznm55qmrllrpg"; }; + propagatedBuildInputs = [ + click + prompt-toolkit + ptable + pygments + requests + urllib3 + ]; + + checkInputs = [ + mock + pytestCheckHook + sphinx + testtools + tkinter + ]; + + pythonImportsCheck = [ "SoftLayer" ]; + meta = with lib; { - description = "A set of Python libraries that assist in calling the SoftLayer API."; + description = "Python libraries that assist in calling the SoftLayer API"; homepage = "https://github.com/softlayer/softlayer-python"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix index 1f639d4f2b..e993636903 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "SoMaJo"; - version = "2.1.3"; + version = "2.1.4"; disabled = !isPy3k; src = fetchFromGitHub { owner = "tsproisl"; repo = pname; rev = "v${version}"; - sha256 = "07jkkg5ph5m47xf8w5asy5930qcpy6p11j0admll2y6yjynd2b47"; + sha256 = "0clcndij4nd5ig7padvb9dj5hfxg6nymn9sf42bjr9ipjihcsbdq"; }; propagatedBuildInputs = [ regex ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.nix index c34bbdfb83..0e0f1f1964 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.nix @@ -25,7 +25,7 @@ let ++ lib.optionals (lang == "ru") [ pymorphy2 ] ++ lib.optionals (pname == "fr_dep_news_trf") [ sentencepiece ]; - postPatch = lib.optionals (pname == "fr_dep_news_trf") '' + postPatch = lib.optionalString (pname == "fr_dep_news_trf") '' substituteInPlace meta.json \ --replace "sentencepiece==0.1.91" "sentencepiece>=0.1.91" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix index dc36066ec3..2223f4b6c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , buildPythonPackage , poetry -, docopt +, docopt-ng , easywatch , jinja2 , pytestCheckHook @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "staticjinja"; - version = "3.0.1"; + version = "4.1.0"; format = "pyproject"; # No tests in pypi @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "sha256-W4q0vG8Kl2gCmA8UnUbdiGRtghhdnWxIJXFIIa6BogA="; + sha256 = "sha256-4IL+7ncJPd1e7k5oFRjQ6yvDjozcBAAZPf88biNTiLU="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 - docopt + docopt-ng easywatch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix index cf1a50c49b..b8a42db27f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "stevedore"; - version = "3.3.0"; + version = "3.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3a5bbd0652bf552748871eaa73a4a8dc2899786bc497a2aa1fcb4dcdb0debeee"; + sha256 = "18aaxj4nrki0bjgzmqxqy20m7763q1xmwishy6biicapgzdqxdar"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index e9b80d7979..12179e6a60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -1,12 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, numpy }: +{ lib +, buildPythonPackage +, fetchPypi +, numpy +}: buildPythonPackage rec { pname = "trimesh"; - version = "3.9.20"; + version = "3.9.29"; src = fetchPypi { inherit pname version; - sha256 = "476173507224bd07febc94070d30e5d704f541b48cd2db4c3bc2fe562498e22c"; + sha256 = "sha256-YEddrun9rLcWk2u3Tfus8W014bU4BKWXWOOhCW/jSlY="; }; propagatedBuildInputs = [ numpy ]; @@ -15,8 +19,10 @@ buildPythonPackage rec { # optional dependencies doCheck = false; + pythonImportsCheck = [ "trimesh" ]; + meta = with lib; { - description = "Python library for loading and using triangular meshes."; + description = "Python library for loading and using triangular meshes"; homepage = "https://trimsh.org/"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix index ab1f3e2b7c..7b0a1f37de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix @@ -1,27 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k , isPyPy +, pytestCheckHook +, pythonOlder , setuptools-scm }: buildPythonPackage rec { pname = "ujson"; - version = "4.0.2"; - disabled = isPyPy || (!isPy3k); + version = "4.1.0"; + disabled = isPyPy || pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d"; + sha256 = "sha256-IrY+xECfDS8sTJ1aozGZfgJHC3oVoyM/PMMvL5uS1Yw="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "ujson" ]; meta = with lib; { - homepage = "https://pypi.python.org/pypi/ujson"; description = "Ultra fast JSON encoder and decoder for Python"; + homepage = "https://pypi.python.org/pypi/ujson"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unidiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unidiff/default.nix index d1e18111db..7dfd5c9d27 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unidiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unidiff/default.nix @@ -1,20 +1,20 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "unidiff"; - version = "0.6.0"; + version = "0.7.0"; - # PyPI tarball doesn't ship tests - src = fetchFromGitHub { - owner = "matiasb"; - repo = "python-unidiff"; - rev = "v${version}"; - sha256 = "0farwkw0nbb5h4369pq3i6pp4047hav0h88ba55rzz5k7mr25rgi"; + src = fetchPypi { + inherit pname version; + sha256 = "91bb13b4969514a400679d9ae5e29a6ffad85346087677f8b5e2e036af817447"; }; + pythonImportsCheck = [ "unidiff" ]; + meta = with lib; { description = "Unified diff python parsing/metadata extraction library"; homepage = "https://github.com/matiasb/python-unidiff"; + changelog = "https://github.com/matiasb/python-unidiff/raw/v${version}/HISTORY"; license = licenses.mit; maintainers = [ maintainers.marsam ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/versioneer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/versioneer/default.nix index 3685e78d4b..5336420c79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/versioneer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/versioneer/default.nix @@ -1,25 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 }: - +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "versioneer"; - version = "0.19"; - disabled = isPy27; + version = "0.20"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a4fed39bbebcbd2d07f8a86084773f303cb442709491955a0e6754858e47afae"; + sha256 = "sha256-Ljk2AOwnF7efWcmE942TX3bkbEyu+HWoe4tO1gLy/2U="; }; # Couldn't get tests to work because, for instance, they used virtualenv and # pip. doCheck = false; + pythonImportsCheck = [ "versioneer" ]; + meta = with lib; { description = "Version-string management for VCS-controlled trees"; homepage = "https://github.com/warner/python-versioneer"; license = licenses.publicDomain; maintainers = with maintainers; [ jluttine ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webdavclient3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webdavclient3/default.nix index fc63c1913d..4d2c37f6b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webdavclient3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webdavclient3/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "webdavclient3"; - version = "3.14.5"; + version = "3.14.6"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0yw3n5m70ysjn1ch48znpn4zr4a1bd0lsm7q2grqz7q5hfjzjwk0"; + sha256 = "bcd22586bb0d58abc26ca56054fd04228e704bd36073c3080f4597c1556c880d"; }; propagatedBuildInputs = [ python-dateutil lxml requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/websocket-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/websocket-client/default.nix index 4822922da3..3a641ab2db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/websocket-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/websocket-client/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "websocket-client"; - version = "1.2.0"; + version = "1.2.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dmW6bGRZibKLYWcIdKt1PmkpF56fyQVlrOasCQ9ZxVk="; + sha256 = "8dfb715d8a992f5712fff8c843adae94e22b22a99b2c5e6b0ec4a1a981cc4e0d"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webtest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webtest/default.nix index d56e5415b9..e5dd4758df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webtest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webtest/default.nix @@ -14,31 +14,44 @@ }: buildPythonPackage rec { - version = "2.0.32"; + version = "2.0.35"; pname = "webtest"; disabled = isPy27; # paste.deploy is not longer a valid import src = fetchPypi { pname = "WebTest"; inherit version; - sha256 = "4221020d502ff414c5fba83c1213985b83219cb1cc611fe58aa4feaf96b5e062"; + sha256 = "sha256-qsFotbK08gCvTjWGfPMWcSIQ49XbgcHL3/OHImR7sIc="; }; preConfigure = '' substituteInPlace setup.py --replace "nose<1.3.0" "nose" ''; - propagatedBuildInputs = [ webob six beautifulsoup4 waitress ]; + propagatedBuildInputs = [ + webob + six + beautifulsoup4 + waitress + ]; - checkInputs = [ nose mock PasteDeploy wsgiproxy2 pyquery ]; + checkInputs = [ + nose + mock + PasteDeploy + wsgiproxy2 + pyquery + ]; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "webtest" ]; + meta = with lib; { description = "Helper to test WSGI applications"; homepage = "https://webtest.readthedocs.org/en/latest/"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whisper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whisper/default.nix index d25053f123..28a2c15a8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whisper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whisper/default.nix @@ -1,19 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi, mock, six }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, six +, pytestCheckHook +}: buildPythonPackage rec { pname = "whisper"; version = "1.1.8"; - src = fetchPypi { - inherit pname version; - sha256 = "345f35d0dccaf181e0aa4353e6c13f40f5cceda10a3c7021dafab29f004f62ae"; + src = fetchFromGitHub { + owner = "graphite-project"; + repo = pname; + rev = version; + sha256 = "11f7sarj62zgpw3ak4a2q55lj7ap4039l9ybc3a6yvs1ppvrcn7x"; }; - propagatedBuildInputs = [ six ]; - checkInputs = [ mock ]; + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + disabledTests = [ + # whisper-resize.py: not found + "test_resize_with_aggregate" + ]; + + pythonImportsCheck = [ "whisper" ]; meta = with lib; { - homepage = "http://graphite.wikidot.com/"; + homepage = "https://github.com/graphite-project/whisper"; description = "Fixed size round-robin style database"; maintainers = with maintainers; [ offline basvandijk ]; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix index 3c63c727c0..5598b189af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix @@ -1,21 +1,51 @@ -{ lib, fetchPypi, buildPythonPackage, isPy27 }: +{ lib +, brotli +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +}: buildPythonPackage rec { pname = "whitenoise"; - version = "5.2.0"; - disabled = isPy27; + version = "5.3.0"; + disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "05ce0be39ad85740a78750c86a93485c40f08ad8c62a6006de0233765996e5c7"; + src = fetchFromGitHub { + owner = "evansd"; + repo = pname; + rev = "v${version}"; + sha256 = "17j1rml1hb43c7fs7kf4ygkpmnjppzgsbnyw3plq9w3yh9w5hkhg"; }; - # No tests - doCheck = false; + propagatedBuildInputs = [ + brotli + ]; + + checkInputs = [ + pytestCheckHook + requests + ]; + + disabledTestPaths = [ + # Don't run Django tests + "tests/test_django_whitenoise.py" + "tests/test_runserver_nostatic.py" + "tests/test_storage.py" + ]; + + disabledTests = [ + # Test fails with AssertionError + "test_modified" + ]; + + pythonImportsCheck = [ "whitenoise" ]; meta = with lib; { description = "Radically simplified static file serving for WSGI applications"; homepage = "http://whitenoise.evans.io/"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix index 9b2c7b116c..5d29264413 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yamale"; - version = "3.0.4"; + version = "3.0.8"; disabled = !isPy3k; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "23andMe"; repo = pname; rev = version; - sha256 = "1xjvah4r3gpwk4zxql3c9jpllb34k175fm6iq1zvsd2vv2fwf8s2"; + sha256 = "0bn0himn5fwndaxn205s55bdc4np7lhd940i0lkv0m7ybhbw7dap"; }; propagatedBuildInputs = [ @@ -28,6 +28,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; + pythonImportsCheck = [ "yamale" ]; meta = with lib; { description = "A schema and validator for YAML"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeep/default.nix index 16fb277746..f88e8bc474 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeep/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeep/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aioresponses -, appdirs , attrs , buildPythonPackage , cached-property @@ -12,6 +11,7 @@ , isodate , lxml , mock +, platformdirs , pretend , pytest-asyncio , pytest-httpx @@ -27,28 +27,28 @@ buildPythonPackage rec { pname = "zeep"; - version = "4.0.0"; + version = "4.1.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "mvantellingen"; repo = "python-zeep"; rev = version; - sha256 = "1rwmwk47fxs8dxwv5dr6gbnbiyilznifb47fhbxgzj231w0y82cm"; + sha256 = "sha256-fJLr2LJpbNQTl183R56G7sJILfm04R39qpJxLogQLoo="; }; propagatedBuildInputs = [ - appdirs attrs cached-property defusedxml httpx isodate lxml + platformdirs pytz requests - requests-toolbelt requests-file + requests-toolbelt xmlsec ]; @@ -62,7 +62,6 @@ buildPythonPackage rec { pytest-httpx pytestCheckHook requests-mock - xmlsec ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index 4fd0276f7f..78df8883cf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.157.0"; + version = "0.158.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-16DDlVCBZ8Rtd5OM9tJUxekzYDAirX1zJ36cyPOv/SU="; + sha256 = "sha256-Wl+Jux20gtl+upaKcFF3ub5TetNUf2GwfenH+Ddvqfw="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix index 5c239cfc63..1c7c290405 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -26,17 +26,32 @@ , luaBindings ? false }: +let + # FIXME: how to keep this up-to-date + # https://github.com/radareorg/vector35-arch-arm64/ + arm64 = fetchFromGitHub { + owner = "radareorg"; + repo = "vector35-arch-arm64"; + rev = "5837915960c2ce862a77c99a374abfb7d18a8534"; + sha256 = "sha256-bs8wjOX+txB193oqIIZ7yx9pwpVhR3HAaWuDLPLG7m4="; + }; +in stdenv.mkDerivation rec { pname = "radare2"; - version = "5.3.1"; + version = "5.4.0"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "sha256-VS8eG5RXwKtJSLmyaSifopJU7WYGMUcznn+burPqEYE="; + sha256 = "sha256-KRHMJ0lW0OF8ejcrigp4caPsuR3iaGcglCYxJSUhGJw="; }; + preBuild = '' + cp -r ${arm64} libr/asm/arch/arm/v35arm64/arch-arm64 + chmod -R +w libr/asm/arch/arm/v35arm64/arch-arm64 + ''; + postInstall = '' install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix index ed060d847e..5ea43e5555 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - version = "4.2.5"; + version = "4.2.6"; pname = "randoop"; src = fetchurl { url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "0v3vla3k6csfb8w0j9njrhcjj4n7yh172n9wv6z397f1sa0fs202"; + sha256 = "sha256-69cKAyMwORG4A91OARmY4uQKgBZIx9N/zc7TZ086CK0="; }; nativeBuildInputs = [ unzip ]; 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 41059a37da..40c9958c34 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 @@ -5,11 +5,11 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.26.0"; + version = "1.29.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "11aqdwhs7wa6cp9zijqi4in3zvwirfnlcy45rrnsq0jdsh3i9hbh"; + sha256 = "sha256-JXphjERqY5Vj8j2F4Z7FrFJJEpBgK/5236pYfQRVdco="; }; # Tests are not included in the PyPI package diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix index 2de586f97c..a29ac38eb1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { ]; # make install attempts to use the just-built cmake - preInstall = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) '' + preInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' sed -i 's|bin/cmake|${buildPackages.cmakeMinimal}/bin/cmake|g' Makefile ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix index 76548e427d..b79e9ff1b7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "e5a5442acf36f047a75b397d7349e6fe6835ef24"; - version = "2021-04-26"; + rev = "d77c348e3f2fdfbd90b51ce0e5894405bb08687c"; + version = "2021-08-04"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "0g7wyh0lhhdch7d6p118lwywy1lcdr1z631q891qhv624jnb1477"; + sha256 = "u0stt4w0iK4h+5PMkqjp9m8kqvrKvM3m7lBcV2yXPKU="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix index d7e546ec44..7584adc041 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.22.0"; + version = "1.22.3"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-F2PUqqzW7e6wmme1rTEJ736Sy/SRR1XVf20j5zDI9/s="; + sha256 = "sha256-e4Y398VyvoDo5WYyLeZJUMmb0HgWNBWj+hCPxdUlZNY="; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 4534298d39..21dbbcf0b7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -9,9 +9,9 @@ buildGoModule rec { doCheck = false; - preBuild = '' - buildFlagsArray+=("-ldflags" "-X main.version=${version}") - ''; + ldflags = [ + "-X main.version=${version}" + ]; src = fetchFromGitHub { owner = "drone"; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pg_activity/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/pg_activity/default.nix new file mode 100644 index 0000000000..6754e76a89 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/database/pg_activity/default.nix @@ -0,0 +1,31 @@ +{ python3Packages, fetchFromGitHub, lib }: + +python3Packages.buildPythonApplication rec { + pname = "pg_activity"; + version = "2.2.0"; + disabled = python3Packages.pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "dalibo"; + repo = pname; + rev = "v${version}"; + sha256 = "145yqjb2rr1k0xz6lclk4fy5zbwcbfkzvn52g9ijjrfl08y15agm"; + }; + + propagatedBuildInputs = with python3Packages; [ + attrs + blessed + humanize + psutil + psycopg2 + ]; + + pythonImportsCheck = [ "pgactivity" ]; + + meta = with lib; { + description = "A top like application for PostgreSQL server activity monitoring"; + homepage = "https://github.com/dalibo/pg_activity"; + license = licenses.postgresql; + maintainers = with maintainers; [ mausch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix index 9ff5c1b01b..c8ab79a34d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "sqlitebrowser"; - version = "3.12.1"; + version = "3.12.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0ray6cscx2qil1dfi7hmpijmq3kba49wn430ih1q4fkz9psjvrz1"; + sha256 = "sha256-33iVic0kxemWld+SiHOWGlKFSi5fpk1RtLUiNDr7WNI="; }; # We should be using qscintilla from nixpkgs instead of the vendored version, diff --git a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix index e4132dd734..9c24d35cbf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "timescaledb-tune"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "v${version}"; - sha256 = "sha256-orCnw+NM9jTrg0oeHg0CQvIXzbSkeCwwDUI1t/+k31o="; + sha256 = "sha256-6xMdOqLfD3NQksmcD7rlTW3xoW2Fi6OmwbpjIj9A/tw="; }; vendorSha256 = "sha256-n2jrg9FiR/gSrbds/QVV8Duf7BTEs36yYi4F3Ve+d0E="; diff --git a/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix b/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix index 437f7f2da5..084f5eea21 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix @@ -16,9 +16,9 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ btrfs-progs lvm2 ]; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X main.version=${version}") - ''; + ldflags = [ + "-s" "-w" "-X main.version=${version}" + ]; preCheck = '' # Remove tests that use networking diff --git a/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix b/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix index ea8296b49f..1d66e059a7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix @@ -36,6 +36,6 @@ buildGoModule rec { homepage = "https://earthly.dev/"; changelog = "https://github.com/earthly/earthly/releases/tag/v${version}"; license = licenses.bsl11; - maintainers = with maintainers; [ mdsp ]; + maintainers = with maintainers; [ matdsoupe ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix index 9886b01310..106361502a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix @@ -115,13 +115,13 @@ rec { headers = "0b66a7nbi1mybqy0j8x6hnp9k0jzvr6lpp4zsazhbfpk47px116y"; }; - electron_13 = mkElectron "13.1.9" { - x86_64-linux = "60c7c74a5dd00ebba6d6b5081a4b83d94ac97ec5e53488b8b8a1b9aabe17fefc"; - x86_64-darwin = "b897bdc42d9d1d0a49fc513c769603bff6e111389e2a626eb628257bc705f634"; - i686-linux = "081f08ce7ff0e1e8fb226a322b855f951d120aa522773f17dd8e5a87969b001f"; - armv7l-linux = "c6b6b538d4764104372539c511921ddecbf522ded1fea856cbc3d9a303a86206"; - aarch64-linux = "9166dd3e703aa8c9f75dfee91fb250b9a08a32d8181991c1143a1da5aa1a9f20"; - aarch64-darwin = "a1600c0321a0906761fdf88ab9f30d1c53b53803ca33bcae20a6ef7a6761cac1"; - headers = "1k9x9hgwl23sd5zsdrdlcjp4ap40g282a1dxs1jyxrwq1dzgmsl3"; + electron_13 = mkElectron "13.2.0" { + x86_64-linux = "def2e796fd0726f097d2c6997827f60de1940944dabcad33257bee9b4f8734da"; + x86_64-darwin = "8d9970c0153e0a79aae5aed053da8652d05fc67c8f29cd17416a860bf7f82c1d"; + i686-linux = "507d57e01b16549fe627bc55d8b94bf0f7676c7368438e749c6048869216d290"; + armv7l-linux = "9f46b2e18729ff50d290babbef3bf57711ed96eceffdd101b109572790f914f2"; + aarch64-linux = "386e0937ef78dce21e48589d6b76748c316ef6d4f8e8157a8b2ca08780ffbe2f"; + aarch64-darwin = "232fa40a9ce498a17aa0be1e72c81173c1f614fd5d48cc34c3f387a3c9921e08"; + headers = "00fwlqpiy2872d2yx4nhcg5a3n7z7cb0z0a82xbrlp6g0clh5v0w"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix index 1ff54223d0..ae8579c16a 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.20"; + version = "0.12.22"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-40r0f+bzzD0M97pbiSoVSJvVvcCizQvw9PPeXhw7U48="; + sha256 = "sha256-vZlrHfcXOz4QHTH9otpwtPIWHGxK4TAol5o/Tl0M98E="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; diff --git a/third_party/nixpkgs/pkgs/development/tools/fprettify/default.nix b/third_party/nixpkgs/pkgs/development/tools/fprettify/default.nix new file mode 100644 index 0000000000..a5eed6bdc2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/fprettify/default.nix @@ -0,0 +1,28 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "fprettify"; + version = "0.3.7"; + + src = fetchFromGitHub { + owner = "pseewald"; + repo = pname; + rev = "v${version}"; + sha256 = "17v52rylmsy3m3j5fcb972flazykz2rvczqfh8mxvikvd6454zyj"; + }; + + preConfigure = '' + patchShebangs fprettify.py + ''; + + propagatedBuildInputs = with python3Packages; [ + configargparse + ]; + + meta = with lib; { + description = "An auto-formatter for modern Fortran code that imposes strict whitespace formatting, written in Python."; + homepage = "https://pypi.org/project/fprettify/"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fabiangd ]; + }; +} 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 4e7711926e..3512c1bf08 100644 --- a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -19,9 +19,9 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - preBuild = '' - buildFlagsArray+=("-ldflags=-s -w -X main.version=${version} -X main.commit=v${version} -X main.date=19700101-00:00:00") - ''; + ldflags = [ + "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" "-X main.date=19700101-00:00:00" + ]; postInstall = '' for shell in bash zsh; do diff --git a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix b/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix index f531e87e81..fe3dfb9a34 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "hcloud"; - version = "1.26.1"; + version = "1.27.0"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-fKekn930nOGYUhkQus9p4sKcsuUks+KfO4+X5C/3nWg="; + sha256 = "sha256-bvPMSys2EY8cMNQ3rG4WlXaI9k2JsEWQkMZnDgcNFhY="; }; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-yPRtqJTmYDqzwHyBmVV4HxOmMe7FuSZ/lsQj8PInhFg="; + vendorSha256 = "sha256-/bqlDcv4lQ49NM849MTlna36ENfzUfcHtwuo75I77VQ="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/just/default.nix b/third_party/nixpkgs/pkgs/development/tools/just/default.nix index cad2c7e1a1..f9121e1e20 100644 --- a/third_party/nixpkgs/pkgs/development/tools/just/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/just/default.nix @@ -2,16 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.9.8"; + version = "0.10.0"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-WT3r6qw/lCZy6hdfAJmoAgUqjSLPVT8fKX4DnqDnhOs="; + sha256 = "sha256-dolx2P7bnGiK3azMkwj75+ZA3qYr3rCUSLhMPtK85zA="; }; - - cargoSha256 = "sha256-0R/9VndP/Oh5/yP7NsBC25jiCSRVNEXhbVksElLXeEc="; + cargoSha256 = "sha256-GPetK2uGB4HIPr/3DdTA0HNHELS8V1MqPtpgilubo9k="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -54,6 +53,9 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip=edit" # trying to run "vim" fails as there's no /usr/bin/env or which in the sandbox to find vim and the dependency is not easily patched "--skip=run_shebang" # test case very rarely fails with "Text file busy" + "--skip=invoke_error_function" # wants JUST_CHOOSER to be fzf + "--skip=status_error" # "exit status" instead of "exit code" + "--skip=exit_status" # "exit status" instead of "exit code" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/ko/default.nix b/third_party/nixpkgs/pkgs/development/tools/ko/default.nix index 4754a32db8..614b5d4c9d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ko/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ko/default.nix @@ -2,6 +2,7 @@ , buildGoModule , fetchFromGitHub , git +, installShellFiles }: buildGoModule rec { @@ -14,18 +15,37 @@ buildGoModule rec { rev = "v${version}"; sha256 = "sha256-LoOXZY4uF7GSS3Dh/ozCsLJTxgmPmZZuEisJ4ShjCBc="; }; - vendorSha256 = null; - excludedPackages = "test"; + # Don't build the legacy main.go or test dir + excludedPackages = "\\(cmd/ko\\|test\\)"; + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ "-s" "-w" "-X github.com/google/ko/pkg/commands.Version=${version}" ]; + checkInputs = [ git ]; preCheck = '' + # resolves some complaints from ko + export GOROOT="$(go env GOROOT)" git init ''; + postInstall = '' + installShellCompletion --cmd ko \ + --bash <($out/bin/ko completion) \ + --zsh <($out/bin/ko completion --zsh) + ''; + meta = with lib; { - description = "A simple, fast container image builder for Go applications."; homepage = "https://github.com/google/ko"; + changelog = "https://github.com/google/ko/releases/tag/v${version}"; + description = "Build and deploy Go applications on Kubernetes"; + longDescription = '' + ko is a simple, fast container image builder for Go applications. + It's ideal for use cases where your image contains a single Go application without any/many dependencies on the OS base image (e.g. no cgo, no OS package dependencies). + ko builds images by effectively executing go build on your local machine, and as such doesn't require docker to be installed. This can make it a good fit for lightweight CI/CD use cases. + ko also includes support for simple YAML templating which makes it a powerful tool for Kubernetes applications. + ''; license = licenses.asl20; - maintainers = with maintainers; [ nickcao ]; + maintainers = with maintainers; [ nickcao jk ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/konstraint/default.nix b/third_party/nixpkgs/pkgs/development/tools/konstraint/default.nix new file mode 100644 index 0000000000..db9edf3b6d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/konstraint/default.nix @@ -0,0 +1,32 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "konstraint"; + version = "0.14.2"; + + src = fetchFromGitHub { + owner = "plexsystems"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-ESkRycS+ObLaDkb28kvi9Wtc4Lc66qHFz0DYMjEa5eE="; + }; + vendorSha256 = "sha256-uvDYUm6REL1hvj77P/+1fMCE1n6ZUP6rp0ma8O2bVkU="; + + # Exclude go within .github folder + excludedPackages = ".github"; + + ldflags = [ "-s" "-w" "-X github.com/plexsystems/konstraint/internal/commands.version=${version}" ]; + + meta = with lib; { + homepage = "https://github.com/plexsystems/konstraint"; + changelog = "https://github.com/plexsystems/konstraint/releases/tag/v${version}"; + description = "A policy management tool for interacting with Gatekeeper"; + longDescription = '' + konstraint is a CLI tool to assist with the creation and management of templates and constraints when using + Gatekeeper. Automatically copy Rego to the ConstraintTemplate. Automatically update all ConstraintTemplates with + library changes. Enable writing the same policies for Conftest and Gatekeeper. + ''; + license = licenses.mit; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/kubeprompt/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubeprompt/default.nix index 39cd59cbec..7b60e87095 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kubeprompt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kubeprompt/default.nix @@ -11,12 +11,10 @@ buildGoModule rec { sha256 = "1a0xi31bd7n2zrx2z4srhvixlbj028h63dlrjzqxgmgn2w6akbz2"; }; - preBuild = '' - export buildFlagsArray+=( - "-ldflags= - -w -s - -X github.com/jlesquembre/kubeprompt/pkg/version.Version=${version}") - ''; + ldflags = [ + "-w" "-s" + "-X github.com/jlesquembre/kubeprompt/pkg/version.Version=${version}" + ]; vendorSha256 = "089lfkvyf00f05kkmr935jbrddf2c0v7m2356whqnz7ad6a2whsi"; diff --git a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix index af33938c1a..c7e3a1fabd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.28.2"; + version = "0.29"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-s5Ou0FhL9+2/xm7lKMG/3ya5P8idI0cgtJ28cV37pJQ="; + sha256 = "sha256-rw03K21Ay/+XKs06cUBybXLp8Rxrlz8T8YKrSGroyDU="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/luaformatter/default.nix b/third_party/nixpkgs/pkgs/development/tools/luaformatter/default.nix index 064ef8453d..5fb82b0fb4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/luaformatter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/luaformatter/default.nix @@ -1,30 +1,33 @@ -{ cmake, fetchFromGitHub, lib, stdenv }: +{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4, libargs, catch2, cmake, libyamlcpp }: stdenv.mkDerivation rec { pname = "luaformatter"; version = "1.3.6"; src = fetchFromGitHub { - owner = "koihik"; - repo = "luaformatter"; + owner = "Koihik"; + repo = "LuaFormatter"; rev = version; - sha256 = "0440kdab5i0vhlk71sbprdrhg362al8jqpy7w2vdhcz1fpi5cm0b"; - fetchSubmodules = true; + sha256 = "14l1f9hrp6m7z3cm5yl0njba6gfixzdirxjl8nihp9val0685vm0"; }; + patches = [ + (substituteAll { + src = ./fix-lib-paths.patch; + antlr4RuntimeCpp = antlr4.runtime.cpp.dev; + inherit libargs catch2 libyamlcpp; + }) + ]; + nativeBuildInputs = [ cmake ]; - installPhase = '' - runHook preInstall - mkdir -p $out/bin - cp lua-format $out/bin - runHook postInstall - ''; + buildInputs = [ antlr4.runtime.cpp libyamlcpp ]; meta = with lib; { - description = "Code formatter for lua"; - homepage = "https://github.com/koihik/luaformatter"; + description = "Code formatter for Lua"; + homepage = "https://github.com/Koihik/LuaFormatter"; license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda SuperSandro2000 ]; + mainProgram = "lua-format"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/lua-format/fix-lib-paths.patch b/third_party/nixpkgs/pkgs/development/tools/luaformatter/fix-lib-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/misc/lua-format/fix-lib-paths.patch rename to third_party/nixpkgs/pkgs/development/tools/luaformatter/fix-lib-paths.patch diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/third_party/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix index 48f01f8d0f..042aff09a5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, perl, autoconf }: stdenv.mkDerivation rec { + # When updating, beware of https://github.com/NixOS/nixpkgs/pull/131928#issuecomment-896614165 name = "automake-1.16.3"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix index 60124ef44c..ac20ca26f8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraformer"; - version = "0.8.11"; + version = "0.8.15"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "sha256-y6cgBYiqy+M8dfcNS6iDohqyip6xAs222MJHJFhloiI="; + sha256 = "sha256-d8DOUvUj5hdc1kcd0vgMufVIOJqV0eG4sXQIX597L/w="; }; - vendorSha256 = "sha256-PQj3+qcmN/raDrAbufAcVT+vSumGuOY47i7ZYfvx3yk="; + vendorSha256 = "sha256-VQ3yZQqpq9KbAkBDnQAfOE+axlT0GhvUpMIjb59PYT0="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/flex/2.5.35.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/flex/2.5.35.nix index b2245ff9c9..ec2c9eeb2d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -16,10 +16,10 @@ stdenv.mkDerivation { propagatedBuildInputs = [ m4 ]; - preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ]; + preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + ac_cv_func_malloc_0_nonnull=yes + ac_cv_func_realloc_0_nonnull=yes + ''; doCheck = false; # fails 2 out of 46 tests diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/flex/2.6.1.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/flex/2.6.1.nix index cc0ecb148c..aeb1416497 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/flex/2.6.1.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/flex/2.6.1.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation { propagatedBuildInputs = [ m4 ]; - preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ]; + preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + ac_cv_func_malloc_0_nonnull=yes + ac_cv_func_realloc_0_nonnull=yes + ''; postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/flex/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/flex/default.nix index 0bc26db575..e0895bab68 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/flex/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/flex/default.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { buildInputs = [ bison ]; propagatedBuildInputs = [ m4 ]; - preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "export ac_cv_func_malloc_0_nonnull=yes" - "export ac_cv_func_realloc_0_nonnull=yes" - ]; + preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + export ac_cv_func_malloc_0_nonnull=yes + export ac_cv_func_realloc_0_nonnull=yes + ''; postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix index 6bbcf36cd2..c23b352dec 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix @@ -15,7 +15,7 @@ let buildInputs = lib.optional build-manual [ transfig ghostscript tex ]; - preConfigure = lib.optional build-manual '' + preConfigure = lib.optionalString build-manual '' sed -i "s/build_manual=no/build_manual=yes/g" DIST ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 3971a7631d..b3803f54b6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -5,7 +5,7 @@ }: let # Poetry2nix version - version = "1.17.1"; + version = "1.19.0"; inherit (poetryLib) isCompatible readTOML moduleName; diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py index 5931d4c927..c1bed08293 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py @@ -5,12 +5,12 @@ # https://discuss.python.org/t/pip-download-just-the-source-packages-no-building-no-metadata-etc/4651/12 import sys -from urllib.parse import urlparse +from urllib.parse import urlparse, urlunparse from html.parser import HTMLParser import urllib.request import shutil import ssl -import os +from os.path import normpath # Parse the legacy index page to extract the href and package names @@ -44,9 +44,13 @@ package_filename = sys.argv[3] print("Reading index %s" % index_url) +context = ssl.create_default_context() +context.check_hostname = False +context.verify_mode = ssl.CERT_NONE + response = urllib.request.urlopen( index_url, - context=ssl.CERT_NONE) + context=context) index = response.read() parser = Pep503() @@ -62,11 +66,24 @@ if urlparse(parser.sources[package_filename]).netloc == '': package_url = index_url + "/" + parser.sources[package_filename] else: package_url = parser.sources[package_filename] -print("Downloading %s" % package_url) + +# Handle urls containing "../" +parsed_url = urlparse(package_url) +real_package_url = urlunparse( + ( + parsed_url.scheme, + parsed_url.netloc, + normpath(parsed_url.path), + parsed_url.params, + parsed_url.query, + parsed_url.fragment, + ) +) +print("Downloading %s" % real_package_url) response = urllib.request.urlopen( - package_url, - context=ssl.CERT_NONE) + real_package_url, + context=context) with response as r: shutil.copyfileobj(r, package_file) diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh index fa7b698fb5..a3ebe311d5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh @@ -15,7 +15,7 @@ pipBuildPhase() { mkdir -p dist echo "Creating a wheel..." - @pythonInterpreter@ -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist . + @pythonInterpreter@ -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist . echo "Finished creating a wheel..." runHook postBuild diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index b403e9941f..867f6d985c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -47,7 +47,8 @@ pythonPackages.callPackage isSource = source != null; isGit = isSource && source.type == "git"; isUrl = isSource && source.type == "url"; - isLocal = isSource && source.type == "directory"; + isDirectory = isSource && source.type == "directory"; + isFile = isSource && source.type == "file"; isLegacy = isSource && source.type == "legacy"; localDepPath = toPath source.url; @@ -71,7 +72,10 @@ pythonPackages.callPackage sourceDist = builtins.filter isSdist fileCandidates; eggs = builtins.filter isEgg fileCandidates; entries = (if preferWheel then binaryDist ++ sourceDist else sourceDist ++ binaryDist) ++ eggs; - lockFileEntry = builtins.head entries; + lockFileEntry = ( + if lib.length entries > 0 then builtins.head entries + else throw "Missing suitable source/wheel file entry for ${name}" + ); _isEgg = isEgg lockFileEntry; in rec { @@ -94,7 +98,7 @@ pythonPackages.callPackage "toml" # Toml is an extra for setuptools-scm ]; baseBuildInputs = lib.optional (! lib.elem name skipSetupToolsSCM) pythonPackages.setuptools-scm; - format = if isLocal || isGit || isUrl then "pyproject" else fileInfo.format; + format = if isDirectory || isGit || isUrl then "pyproject" else fileInfo.format; in buildPythonPackage { pname = moduleName name; @@ -118,7 +122,7 @@ pythonPackages.callPackage baseBuildInputs ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) pythonPackages.setuptools ++ lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg - ++ lib.optional isLocal buildSystemPkgs + ++ lib.optional isDirectory buildSystemPkgs ++ lib.optional (!__isBootstrap) pythonPackages.poetry ); @@ -170,8 +174,10 @@ pythonPackages.callPackage { inherit (source) url; } - else if isLocal then + else if isDirectory then (poetryLib.cleanPythonSources { src = localDepPath; }) + else if isFile then + localDepPath else if isLegacy then fetchFromLegacy { diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 2a9e240e7a..ca902e204d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -52,6 +52,18 @@ self: super: } ); + anyio = super.anyio.overridePythonAttrs (old: { + postPatch = '' + substituteInPlace setup.py --replace 'setup()' 'setup(version="${old.version}")' + ''; + }); + + arpeggio = super.arpeggio.overridePythonAttrs ( + old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; + } + ); + astroid = super.astroid.overridePythonAttrs ( old: rec { buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; @@ -68,6 +80,14 @@ self: super: } ); + backports-entry-points-selectable = super.backports-entry-points-selectable.overridePythonAttrs (old: { + postPatch = '' + substituteInPlace setup.py --replace \ + 'setuptools.setup()' \ + 'setuptools.setup(version="${old.version}")' + ''; + }); + bcrypt = super.bcrypt.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libffi ]; @@ -493,7 +513,7 @@ self: super: old: { inherit (pkgs.python3Packages.jira) patches; buildInputs = (old.buildInputs or [ ]) ++ [ - self.pytest-runner + self.pytestrunner self.cryptography self.pyjwt ]; @@ -620,7 +640,8 @@ self: super: buildInputs = (old.buildInputs or [ ]) ++ lib.optional enableGhostscript pkgs.ghostscript - ++ lib.optional stdenv.isDarwin [ Cocoa ]; + ++ lib.optional stdenv.isDarwin [ Cocoa ] + ++ [ self.certifi ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config @@ -962,6 +983,7 @@ self: super: ]; PYARROW_BUILD_TYPE = "release"; + PYARROW_WITH_DATASET = true; PYARROW_WITH_PARQUET = true; PYARROW_CMAKE_OPTIONS = [ "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" @@ -1263,6 +1285,8 @@ self: super: } ); + pytest-runner = super.pytest-runner or super.pytestrunner; + pytest-pylint = super.pytest-pylint.overridePythonAttrs ( old: { buildInputs = [ self.pytest-runner ]; @@ -1372,6 +1396,16 @@ self: super: } ); + requests-unixsocket = super.requests-unixsocket.overridePythonAttrs ( + old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pbr ]; + } + ); + + requestsexceptions = super.requestsexceptions.overridePythonAttrs (old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ self.pbr ]; + }); + rlp = super.rlp.overridePythonAttrs { preConfigure = '' substituteInPlace setup.py --replace \'setuptools-markdown\' "" @@ -1831,4 +1865,58 @@ self: super: ''; }); + marisa-trie = super.marisa-trie.overridePythonAttrs ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; + } + ); + + ua-parser = super.ua-parser.overridePythonAttrs ( + old: { + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.pyyaml ]; + } + ); + + lazy-object-proxy = super.lazy-object-proxy.overridePythonAttrs ( + old: { + # disable the removal of pyproject.toml, required because of setuptools_scm + dontPreferSetupPy = true; + } + ); + + pendulum = super.pendulum.overridePythonAttrs (old: { + # Technically incorrect, but fixes the build error.. + preInstall = lib.optionalString stdenv.isLinux '' + mv ./dist/*.whl $(echo ./dist/*.whl | sed s/'manylinux_[0-9]*_[0-9]*'/'manylinux1'/) + ''; + }); + + pygraphviz = super.pygraphviz.overridePythonAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.graphviz ]; + }); + + pyjsg = super.pyjsg.overridePythonAttrs (old: { + buildInputs = (old.buildInputs or [ ]) ++ [ self.pbr ]; + }); + + pyshex = super.pyshex.overridePythonAttrs (old: { + buildInputs = (old.buildInputs or [ ]) ++ [ self.pbr ]; + }); + + pyshexc = super.pyshexc.overridePythonAttrs (old: { + buildInputs = (old.buildInputs or [ ]) ++ [ self.pbr ]; + }); + + shexjsg = super.shexjsg.overridePythonAttrs (old: { + buildInputs = (old.buildInputs or [ ]) ++ [ self.pbr ]; + }); + + sparqlslurper = super.sparqlslurper.overridePythonAttrs (old: { + buildInputs = (old.buildInputs or [ ]) ++ [ self.pbr ]; + }); + + tomli = super.tomli.overridePythonAttrs (old: { + buildInputs = (old.buildInputs or [ ]) ++ [ self.flit-core ]; + }); } diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix index a5ec51a134..9c95194a53 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix @@ -132,7 +132,8 @@ let mVal = ''[a-zA-Z0-9\'"_\. \-]+''; mOp = "in|[!=<>]+"; e = stripStr exprs.value; - m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e); + m' = builtins.match ''^(${mVal}) +(${mOp}) *(${mVal})$'' e; + m = builtins.map stripStr (if m' != null then m' else builtins.match ''^(${mVal}) +(${mOp}) *(${mVal})$'' e); m0 = processVar (builtins.elemAt m 0); m2 = processVar (builtins.elemAt m 2); in diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix index 70470ba172..8e52d7387c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix @@ -1,11 +1,18 @@ -{ lib, poetry2nix, python, fetchFromGitHub }: +{ lib +, poetry2nix +, python +, fetchFromGitHub +, projectDir ? ./. +, pyproject ? projectDir + "/pyproject.toml" +, poetrylock ? projectDir + "/poetry.lock" +}: poetry2nix.mkPoetryApplication { inherit python; - projectDir = ./.; + inherit projectDir pyproject poetrylock; # Don't include poetry in inputs __isBootstrap = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock index b1be7a3f4e..c6073348e8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock @@ -1,11 +1,3 @@ -[[package]] -name = "appdirs" -version = "1.4.4" -description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." -category = "main" -optional = false -python-versions = "*" - [[package]] name = "atomicwrites" version = "1.4.0" @@ -16,29 +8,44 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "attrs" -version = "20.3.0" +version = "21.2.0" description = "Classes Without Boilerplate" category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [package.extras] -dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "furo", "sphinx", "pre-commit"] -docs = ["furo", "sphinx", "zope.interface"] -tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"] -tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six"] +dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit"] +docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"] +tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface"] +tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins"] + +[[package]] +name = "backports.entry-points-selectable" +version = "1.1.0" +description = "Compatibility shim providing selectable entry points for older implementations" +category = "main" +optional = false +python-versions = ">=2.7" + +[package.dependencies] +importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} + +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] +testing = ["pytest (>=4.6)", "pytest-flake8", "pytest-cov", "pytest-black (>=0.3.7)", "pytest-mypy", "pytest-checkdocs (>=2.4)", "pytest-enabler (>=1.0.1)"] [[package]] name = "backports.functools-lru-cache" -version = "1.6.1" +version = "1.6.4" description = "Backport of functools.lru_cache" category = "dev" optional = false python-versions = ">=2.6" [package.extras] -docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov"] +docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] +testing = ["pytest (>=4.6)", "pytest-black (>=0.3.7)", "pytest-mypy", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "pytest-checkdocs (>=2.4)"] [[package]] name = "cachecontrol" @@ -72,7 +79,7 @@ msgpack = ["msgpack-python (>=0.5,<0.6)"] [[package]] name = "certifi" -version = "2020.12.5" +version = "2021.5.30" description = "Python package for providing Mozilla's CA Bundle." category = "main" optional = false @@ -80,7 +87,7 @@ python-versions = "*" [[package]] name = "cffi" -version = "1.14.5" +version = "1.14.6" description = "Foreign Function Interface for Python calling C code." category = "main" optional = false @@ -91,7 +98,7 @@ pycparser = "*" [[package]] name = "cfgv" -version = "3.2.0" +version = "3.3.0" description = "Validate configuration and produce human readable error messages." category = "dev" optional = false @@ -189,6 +196,25 @@ python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*" [package.dependencies] cffi = ">=1.8,<1.11.3 || >1.11.3" +six = ">=1.4.1" + +[package.extras] +docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"] +docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"] +pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"] +ssh = ["bcrypt (>=3.1.5)"] +test = ["pytest (>=3.6.0,!=3.9.0,!=3.9.1,!=3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"] + +[[package]] +name = "cryptography" +version = "3.3.2" +description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." +category = "main" +optional = false +python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*" + +[package.dependencies] +cffi = ">=1.12" enum34 = {version = "*", markers = "python_version < \"3\""} ipaddress = {version = "*", markers = "python_version < \"3\""} six = ">=1.4.1" @@ -202,7 +228,7 @@ test = ["pytest (>=3.6.0,!=3.9.0,!=3.9.1,!=3.9.2)", "pretend", "iso8601", "pytz" [[package]] name = "cryptography" -version = "3.4.6" +version = "3.4.7" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." category = "main" optional = false @@ -221,7 +247,7 @@ test = ["pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pret [[package]] name = "distlib" -version = "0.3.1" +version = "0.3.2" description = "Distribution utilities" category = "main" optional = false @@ -317,14 +343,14 @@ six = "*" [[package]] name = "identify" -version = "2.1.0" +version = "2.2.13" description = "File identification library for Python" category = "dev" optional = false python-versions = ">=3.6.1" [package.extras] -license = ["editdistance"] +license = ["editdistance-s"] [[package]] name = "idna" @@ -380,14 +406,26 @@ python-versions = "*" [[package]] name = "jeepney" -version = "0.6.0" +version = "0.4.3" +description = "Low-level, pure Python DBus protocol wrapper." +category = "main" +optional = false +python-versions = ">=3.5" + +[package.extras] +dev = ["testpath"] + +[[package]] +name = "jeepney" +version = "0.7.1" description = "Low-level, pure Python DBus protocol wrapper." category = "main" optional = false python-versions = ">=3.6" [package.extras] -test = ["pytest", "pytest-trio", "pytest-asyncio", "testpath", "trio"] +test = ["pytest", "pytest-trio", "pytest-asyncio", "testpath", "trio", "async-timeout"] +trio = ["trio", "async-generator"] [[package]] name = "keyring" @@ -479,15 +517,15 @@ six = ">=1.0.0,<2.0.0" [[package]] name = "more-itertools" -version = "8.6.0" +version = "7.2.0" description = "More routines for operating on iterables, beyond itertools" category = "dev" optional = false -python-versions = ">=3.5" +python-versions = ">=3.4" [[package]] name = "more-itertools" -version = "8.7.0" +version = "8.8.0" description = "More routines for operating on iterables, beyond itertools" category = "dev" optional = false @@ -503,7 +541,7 @@ python-versions = "*" [[package]] name = "nodeenv" -version = "1.5.0" +version = "1.6.0" description = "Node.js virtual environment builder" category = "dev" optional = false @@ -530,7 +568,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "pathlib2" -version = "2.3.5" +version = "2.3.6" description = "Object-oriented filesystem paths" category = "main" optional = false @@ -553,7 +591,7 @@ ptyprocess = ">=0.5" [[package]] name = "pkginfo" -version = "1.7.0" +version = "1.7.1" description = "Query metadatdata from sdists / bdists / installed packages." category = "main" optional = false @@ -562,6 +600,14 @@ python-versions = "*" [package.extras] testing = ["nose", "coverage"] +[[package]] +name = "platformdirs" +version = "2.0.2" +description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + [[package]] name = "pluggy" version = "0.13.1" @@ -578,7 +624,7 @@ dev = ["pre-commit", "tox"] [[package]] name = "poetry-core" -version = "1.0.2" +version = "1.0.4" description = "Poetry PEP 517 Build Backend" category = "main" optional = false @@ -593,7 +639,7 @@ typing = {version = ">=3.7.4.1,<4.0.0.0", markers = "python_version >= \"2.7\" a [[package]] name = "pre-commit" -version = "2.10.1" +version = "2.14.0" description = "A framework for managing and maintaining multi-language pre-commit hooks." category = "dev" optional = false @@ -635,7 +681,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "pylev" -version = "1.3.0" +version = "1.4.0" description = "A pure Python Levenshtein implementation that's not freaking GPL'd." category = "main" optional = false @@ -703,7 +749,7 @@ testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xm [[package]] name = "pytest-cov" -version = "2.11.1" +version = "2.12.1" description = "Pytest plugin for measuring coverage." category = "dev" optional = false @@ -712,9 +758,10 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [package.dependencies] coverage = ">=5.2.1" pytest = ">=4.6" +toml = "*" [package.extras] -testing = ["fields", "hunter", "process-tests (==2.0.2)", "six", "pytest-xdist", "virtualenv"] +testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtualenv"] [[package]] name = "pytest-mock" @@ -811,6 +858,18 @@ cryptography = "*" [package.extras] dbus-python = ["dbus-python"] +[[package]] +name = "secretstorage" +version = "3.2.0" +description = "Python bindings to FreeDesktop.org Secret Service API" +category = "main" +optional = false +python-versions = ">=3.5" + +[package.dependencies] +cryptography = ">=2.0" +jeepney = ">=0.4.2" + [[package]] name = "secretstorage" version = "3.3.1" @@ -833,7 +892,7 @@ python-versions = "!=3.0,!=3.1,!=3.2,!=3.3,>=2.6" [[package]] name = "singledispatch" -version = "3.6.1" +version = "3.7.0" description = "Backport functools.singledispatch from Python 3.4 to Python 2.6-3.3." category = "main" optional = false @@ -844,11 +903,11 @@ six = "*" [package.extras] docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-black (>=0.3.7)", "unittest2"] +testing = ["pytest (>=4.6)", "pytest-flake8", "pytest-cov", "pytest-black (>=0.3.7)", "unittest2", "pytest-checkdocs (>=2.4)"] [[package]] name = "six" -version = "1.15.0" +version = "1.16.0" description = "Python 2 and 3 compatibility utilities" category = "main" optional = false @@ -880,7 +939,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "tomlkit" -version = "0.7.0" +version = "0.7.2" description = "Style preserving TOML library" category = "main" optional = false @@ -893,7 +952,7 @@ typing = {version = ">=3.6,<4.0", markers = "python_version >= \"2.7\" and pytho [[package]] name = "tox" -version = "3.23.0" +version = "3.24.2" description = "tox is a generic virtualenv management and test command line tool" category = "dev" optional = false @@ -916,15 +975,15 @@ testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "psutil (>=5.6.1)", "pytes [[package]] name = "typing" -version = "3.7.4.3" +version = "3.10.0.0" description = "Type Hints for Python" category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <3.5" [[package]] name = "typing-extensions" -version = "3.7.4.3" +version = "3.10.0.0" description = "Backported and Experimental Type Hints for Python 3.5+" category = "main" optional = false @@ -945,24 +1004,25 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "virtualenv" -version = "20.4.2" +version = "20.7.2" description = "Virtual Python Environment builder" category = "main" optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" [package.dependencies] -appdirs = ">=1.4.3,<2" +"backports.entry-points-selectable" = ">=1.0.4" distlib = ">=0.3.1,<1" filelock = ">=3.0.0,<4" importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} importlib-resources = {version = ">=1.0", markers = "python_version < \"3.7\""} pathlib2 = {version = ">=2.3.3,<3", markers = "python_version < \"3.4\" and sys_platform != \"win32\""} +platformdirs = ">=2,<3" six = ">=1.9.0,<2" [package.extras] docs = ["proselint (>=0.10.2)", "sphinx (>=3)", "sphinx-argparse (>=0.2.5)", "sphinx-rtd-theme (>=0.4.3)", "towncrier (>=19.9.0rc1)"] -testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)", "pytest (>=4)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.1)", "pytest-mock (>=2)", "pytest-randomly (>=1)", "pytest-timeout (>=1)", "packaging (>=20.0)", "xonsh (>=0.9.16)"] +testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)", "pytest (>=4)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.1)", "pytest-mock (>=2)", "pytest-randomly (>=1)", "pytest-timeout (>=1)", "packaging (>=20.0)"] [[package]] name = "wcwidth" @@ -1001,24 +1061,24 @@ testing = ["pathlib2", "unittest2", "jaraco.itertools", "func-timeout"] [metadata] lock-version = "1.1" python-versions = "~2.7 || ^3.5" -content-hash = "f716089bf560bb051980ddb5ff40b200027e9d9f2ed17fc7dd5576d80f5ad62a" +content-hash = "e45e80a8cc2d64595c7f7e7a494dc8e80a7c1cd9f87cfd89539330e74823c06a" [metadata.files] -appdirs = [ - {file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"}, - {file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"}, -] atomicwrites = [ {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"}, {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"}, ] attrs = [ - {file = "attrs-20.3.0-py2.py3-none-any.whl", hash = "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6"}, - {file = "attrs-20.3.0.tar.gz", hash = "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"}, + {file = "attrs-21.2.0-py2.py3-none-any.whl", hash = "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1"}, + {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"}, +] +"backports.entry-points-selectable" = [ + {file = "backports.entry_points_selectable-1.1.0-py2.py3-none-any.whl", hash = "sha256:a6d9a871cde5e15b4c4a53e3d43ba890cc6861ec1332c9c2428c92f977192acc"}, + {file = "backports.entry_points_selectable-1.1.0.tar.gz", hash = "sha256:988468260ec1c196dab6ae1149260e2f5472c9110334e5d51adcb77867361f6a"}, ] "backports.functools-lru-cache" = [ - {file = "backports.functools_lru_cache-1.6.1-py2.py3-none-any.whl", hash = "sha256:0bada4c2f8a43d533e4ecb7a12214d9420e66eb206d54bf2d682581ca4b80848"}, - {file = "backports.functools_lru_cache-1.6.1.tar.gz", hash = "sha256:8fde5f188da2d593bd5bc0be98d9abc46c95bb8a9dde93429570192ee6cc2d4a"}, + {file = "backports.functools_lru_cache-1.6.4-py2.py3-none-any.whl", hash = "sha256:dbead04b9daa817909ec64e8d2855fb78feafe0b901d4568758e3a60559d8978"}, + {file = "backports.functools_lru_cache-1.6.4.tar.gz", hash = "sha256:d5ed2169378b67d3c545e5600d363a923b09c456dab1593914935a68ad478271"}, ] cachecontrol = [ {file = "CacheControl-0.12.6-py2.py3-none-any.whl", hash = "sha256:10d056fa27f8563a271b345207402a6dcce8efab7e5b377e270329c62471b10d"}, @@ -1029,51 +1089,59 @@ cachy = [ {file = "cachy-0.3.0.tar.gz", hash = "sha256:186581f4ceb42a0bbe040c407da73c14092379b1e4c0e327fdb72ae4a9b269b1"}, ] certifi = [ - {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"}, - {file = "certifi-2020.12.5.tar.gz", hash = "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c"}, + {file = "certifi-2021.5.30-py2.py3-none-any.whl", hash = "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8"}, + {file = "certifi-2021.5.30.tar.gz", hash = "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"}, ] cffi = [ - {file = "cffi-1.14.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991"}, - {file = "cffi-1.14.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1"}, - {file = "cffi-1.14.5-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa"}, - {file = "cffi-1.14.5-cp27-cp27m-win32.whl", hash = "sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3"}, - {file = "cffi-1.14.5-cp27-cp27m-win_amd64.whl", hash = "sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5"}, - {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482"}, - {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6"}, - {file = "cffi-1.14.5-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045"}, - {file = "cffi-1.14.5-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa"}, - {file = "cffi-1.14.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406"}, - {file = "cffi-1.14.5-cp35-cp35m-win32.whl", hash = "sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369"}, - {file = "cffi-1.14.5-cp35-cp35m-win_amd64.whl", hash = "sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315"}, - {file = "cffi-1.14.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132"}, - {file = "cffi-1.14.5-cp36-cp36m-win32.whl", hash = "sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53"}, - {file = "cffi-1.14.5-cp36-cp36m-win_amd64.whl", hash = "sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813"}, - {file = "cffi-1.14.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49"}, - {file = "cffi-1.14.5-cp37-cp37m-win32.whl", hash = "sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62"}, - {file = "cffi-1.14.5-cp37-cp37m-win_amd64.whl", hash = "sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4"}, - {file = "cffi-1.14.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux1_i686.whl", hash = "sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827"}, - {file = "cffi-1.14.5-cp38-cp38-win32.whl", hash = "sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e"}, - {file = "cffi-1.14.5-cp38-cp38-win_amd64.whl", hash = "sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396"}, - {file = "cffi-1.14.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee"}, - {file = "cffi-1.14.5-cp39-cp39-win32.whl", hash = "sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396"}, - {file = "cffi-1.14.5-cp39-cp39-win_amd64.whl", hash = "sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d"}, - {file = "cffi-1.14.5.tar.gz", hash = "sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"}, + {file = "cffi-1.14.6-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:22b9c3c320171c108e903d61a3723b51e37aaa8c81255b5e7ce102775bd01e2c"}, + {file = "cffi-1.14.6-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:f0c5d1acbfca6ebdd6b1e3eded8d261affb6ddcf2186205518f1428b8569bb99"}, + {file = "cffi-1.14.6-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99f27fefe34c37ba9875f224a8f36e31d744d8083e00f520f133cab79ad5e819"}, + {file = "cffi-1.14.6-cp27-cp27m-win32.whl", hash = "sha256:55af55e32ae468e9946f741a5d51f9896da6b9bf0bbdd326843fec05c730eb20"}, + {file = "cffi-1.14.6-cp27-cp27m-win_amd64.whl", hash = "sha256:7bcac9a2b4fdbed2c16fa5681356d7121ecabf041f18d97ed5b8e0dd38a80224"}, + {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:ed38b924ce794e505647f7c331b22a693bee1538fdf46b0222c4717b42f744e7"}, + {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:e22dcb48709fc51a7b58a927391b23ab37eb3737a98ac4338e2448bef8559b33"}, + {file = "cffi-1.14.6-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:aedb15f0a5a5949ecb129a82b72b19df97bbbca024081ed2ef88bd5c0a610534"}, + {file = "cffi-1.14.6-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:48916e459c54c4a70e52745639f1db524542140433599e13911b2f329834276a"}, + {file = "cffi-1.14.6-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:f627688813d0a4140153ff532537fbe4afea5a3dffce1f9deb7f91f848a832b5"}, + {file = "cffi-1.14.6-cp35-cp35m-win32.whl", hash = "sha256:f0010c6f9d1a4011e429109fda55a225921e3206e7f62a0c22a35344bfd13cca"}, + {file = "cffi-1.14.6-cp35-cp35m-win_amd64.whl", hash = "sha256:57e555a9feb4a8460415f1aac331a2dc833b1115284f7ded7278b54afc5bd218"}, + {file = "cffi-1.14.6-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e8c6a99be100371dbb046880e7a282152aa5d6127ae01783e37662ef73850d8f"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:19ca0dbdeda3b2615421d54bef8985f72af6e0c47082a8d26122adac81a95872"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:d950695ae4381ecd856bcaf2b1e866720e4ab9a1498cba61c602e56630ca7195"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9dc245e3ac69c92ee4c167fbdd7428ec1956d4e754223124991ef29eb57a09d"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a8661b2ce9694ca01c529bfa204dbb144b275a31685a075ce123f12331be790b"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b315d709717a99f4b27b59b021e6207c64620790ca3e0bde636a6c7f14618abb"}, + {file = "cffi-1.14.6-cp36-cp36m-win32.whl", hash = "sha256:80b06212075346b5546b0417b9f2bf467fea3bfe7352f781ffc05a8ab24ba14a"}, + {file = "cffi-1.14.6-cp36-cp36m-win_amd64.whl", hash = "sha256:a9da7010cec5a12193d1af9872a00888f396aba3dc79186604a09ea3ee7c029e"}, + {file = "cffi-1.14.6-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4373612d59c404baeb7cbd788a18b2b2a8331abcc84c3ba40051fcd18b17a4d5"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f10afb1004f102c7868ebfe91c28f4a712227fe4cb24974350ace1f90e1febbf"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:fd4305f86f53dfd8cd3522269ed7fc34856a8ee3709a5e28b2836b2db9d4cd69"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6d6169cb3c6c2ad50db5b868db6491a790300ade1ed5d1da29289d73bbe40b56"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5d4b68e216fc65e9fe4f524c177b54964af043dde734807586cf5435af84045c"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33791e8a2dc2953f28b8d8d300dde42dd929ac28f974c4b4c6272cb2955cb762"}, + {file = "cffi-1.14.6-cp37-cp37m-win32.whl", hash = "sha256:0c0591bee64e438883b0c92a7bed78f6290d40bf02e54c5bf0978eaf36061771"}, + {file = "cffi-1.14.6-cp37-cp37m-win_amd64.whl", hash = "sha256:8eb687582ed7cd8c4bdbff3df6c0da443eb89c3c72e6e5dcdd9c81729712791a"}, + {file = "cffi-1.14.6-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ba6f2b3f452e150945d58f4badd92310449876c4c954836cfb1803bdd7b422f0"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux1_i686.whl", hash = "sha256:64fda793737bc4037521d4899be780534b9aea552eb673b9833b01f945904c2e"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:9f3e33c28cd39d1b655ed1ba7247133b6f7fc16fa16887b120c0c670e35ce346"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26bb2549b72708c833f5abe62b756176022a7b9a7f689b571e74c8478ead51dc"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eb687a11f0a7a1839719edd80f41e459cc5366857ecbed383ff376c4e3cc6afd"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d2ad4d668a5c0645d281dcd17aff2be3212bc109b33814bbb15c4939f44181cc"}, + {file = "cffi-1.14.6-cp38-cp38-win32.whl", hash = "sha256:487d63e1454627c8e47dd230025780e91869cfba4c753a74fda196a1f6ad6548"}, + {file = "cffi-1.14.6-cp38-cp38-win_amd64.whl", hash = "sha256:c33d18eb6e6bc36f09d793c0dc58b0211fccc6ae5149b808da4a62660678b156"}, + {file = "cffi-1.14.6-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:06c54a68935738d206570b20da5ef2b6b6d92b38ef3ec45c5422c0ebaf338d4d"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux1_i686.whl", hash = "sha256:f174135f5609428cc6e1b9090f9268f5c8935fddb1b25ccb8255a2d50de6789e"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f3ebe6e73c319340830a9b2825d32eb6d8475c1dac020b4f0aa774ee3b898d1c"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c8d896becff2fa653dc4438b54a5a25a971d1f4110b32bd3068db3722c80202"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4922cd707b25e623b902c86188aca466d3620892db76c0bdd7b99a3d5e61d35f"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c9e005e9bd57bc987764c32a1bee4364c44fdc11a3cc20a40b93b444984f2b87"}, + {file = "cffi-1.14.6-cp39-cp39-win32.whl", hash = "sha256:eb9e2a346c5238a30a746893f23a9535e700f8192a68c07c0258e7ece6ff3728"}, + {file = "cffi-1.14.6-cp39-cp39-win_amd64.whl", hash = "sha256:818014c754cd3dba7229c0f5884396264d51ffb87ec86e927ef0be140bfdb0d2"}, + {file = "cffi-1.14.6.tar.gz", hash = "sha256:c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"}, ] cfgv = [ - {file = "cfgv-3.2.0-py2.py3-none-any.whl", hash = "sha256:32e43d604bbe7896fe7c248a9c2276447dbef840feb28fe20494f62af110211d"}, - {file = "cfgv-3.2.0.tar.gz", hash = "sha256:cf22deb93d4bcf92f345a5c3cd39d3d41d6340adc60c78bbbd6588c384fda6a1"}, + {file = "cfgv-3.3.0-py2.py3-none-any.whl", hash = "sha256:b449c9c6118fe8cca7fa5e00b9ec60ba08145d281d52164230a69211c5d597a1"}, + {file = "cfgv-3.3.0.tar.gz", hash = "sha256:9e600479b3b99e8af981ecdfc80a0296104ee610cab48a5ae4ffd0b668650eb1"}, ] chardet = [ {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"}, @@ -1180,17 +1248,36 @@ cryptography = [ {file = "cryptography-3.2.1-cp38-cp38-win32.whl", hash = "sha256:3cd75a683b15576cfc822c7c5742b3276e50b21a06672dc3a800a2d5da4ecd1b"}, {file = "cryptography-3.2.1-cp38-cp38-win_amd64.whl", hash = "sha256:d25cecbac20713a7c3bc544372d42d8eafa89799f492a43b79e1dfd650484851"}, {file = "cryptography-3.2.1.tar.gz", hash = "sha256:d3d5e10be0cf2a12214ddee45c6bd203dab435e3d83b4560c03066eda600bfe3"}, - {file = "cryptography-3.4.6-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:57ad77d32917bc55299b16d3b996ffa42a1c73c6cfa829b14043c561288d2799"}, - {file = "cryptography-3.4.6-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:93cfe5b7ff006de13e1e89830810ecbd014791b042cbe5eec253be11ac2b28f3"}, - {file = "cryptography-3.4.6-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:5ecf2bcb34d17415e89b546dbb44e73080f747e504273e4d4987630493cded1b"}, - {file = "cryptography-3.4.6-cp36-abi3-manylinux2014_x86_64.whl", hash = "sha256:fec7fb46b10da10d9e1d078d1ff8ed9e05ae14f431fdbd11145edd0550b9a964"}, - {file = "cryptography-3.4.6-cp36-abi3-win32.whl", hash = "sha256:df186fcbf86dc1ce56305becb8434e4b6b7504bc724b71ad7a3239e0c9d14ef2"}, - {file = "cryptography-3.4.6-cp36-abi3-win_amd64.whl", hash = "sha256:66b57a9ca4b3221d51b237094b0303843b914b7d5afd4349970bb26518e350b0"}, - {file = "cryptography-3.4.6.tar.gz", hash = "sha256:2d32223e5b0ee02943f32b19245b61a62db83a882f0e76cc564e1cec60d48f87"}, + {file = "cryptography-3.3.2-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:541dd758ad49b45920dda3b5b48c968f8b2533d8981bcdb43002798d8f7a89ed"}, + {file = "cryptography-3.3.2-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:49570438e60f19243e7e0d504527dd5fe9b4b967b5a1ff21cc12b57602dd85d3"}, + {file = "cryptography-3.3.2-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:a9a4ac9648d39ce71c2f63fe7dc6db144b9fa567ddfc48b9fde1b54483d26042"}, + {file = "cryptography-3.3.2-cp27-cp27m-win32.whl", hash = "sha256:aa4969f24d536ae2268c902b2c3d62ab464b5a66bcb247630d208a79a8098e9b"}, + {file = "cryptography-3.3.2-cp27-cp27m-win_amd64.whl", hash = "sha256:1bd0ccb0a1ed775cd7e2144fe46df9dc03eefd722bbcf587b3e0616ea4a81eff"}, + {file = "cryptography-3.3.2-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:e18e6ab84dfb0ab997faf8cca25a86ff15dfea4027b986322026cc99e0a892da"}, + {file = "cryptography-3.3.2-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:c7390f9b2119b2b43160abb34f63277a638504ef8df99f11cb52c1fda66a2e6f"}, + {file = "cryptography-3.3.2-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:0d7b69674b738068fa6ffade5c962ecd14969690585aaca0a1b1fc9058938a72"}, + {file = "cryptography-3.3.2-cp36-abi3-manylinux1_x86_64.whl", hash = "sha256:922f9602d67c15ade470c11d616f2b2364950602e370c76f0c94c94ae672742e"}, + {file = "cryptography-3.3.2-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:a0f0b96c572fc9f25c3f4ddbf4688b9b38c69836713fb255f4a2715d93cbaf44"}, + {file = "cryptography-3.3.2-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:a777c096a49d80f9d2979695b835b0f9c9edab73b59e4ceb51f19724dda887ed"}, + {file = "cryptography-3.3.2-cp36-abi3-win32.whl", hash = "sha256:3c284fc1e504e88e51c428db9c9274f2da9f73fdf5d7e13a36b8ecb039af6e6c"}, + {file = "cryptography-3.3.2-cp36-abi3-win_amd64.whl", hash = "sha256:7951a966613c4211b6612b0352f5bf29989955ee592c4a885d8c7d0f830d0433"}, + {file = "cryptography-3.3.2.tar.gz", hash = "sha256:5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed"}, + {file = "cryptography-3.4.7-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:3d8427734c781ea5f1b41d6589c293089704d4759e34597dce91014ac125aad1"}, + {file = "cryptography-3.4.7-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:8e56e16617872b0957d1c9742a3f94b43533447fd78321514abbe7db216aa250"}, + {file = "cryptography-3.4.7-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:37340614f8a5d2fb9aeea67fd159bfe4f5f4ed535b1090ce8ec428b2f15a11f2"}, + {file = "cryptography-3.4.7-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:240f5c21aef0b73f40bb9f78d2caff73186700bf1bc6b94285699aff98cc16c6"}, + {file = "cryptography-3.4.7-cp36-abi3-manylinux2014_x86_64.whl", hash = "sha256:1e056c28420c072c5e3cb36e2b23ee55e260cb04eee08f702e0edfec3fb51959"}, + {file = "cryptography-3.4.7-cp36-abi3-win32.whl", hash = "sha256:0f1212a66329c80d68aeeb39b8a16d54ef57071bf22ff4e521657b27372e327d"}, + {file = "cryptography-3.4.7-cp36-abi3-win_amd64.whl", hash = "sha256:de4e5f7f68220d92b7637fc99847475b59154b7a1b3868fb7385337af54ac9ca"}, + {file = "cryptography-3.4.7-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:26965837447f9c82f1855e0bc8bc4fb910240b6e0d16a664bb722df3b5b06873"}, + {file = "cryptography-3.4.7-pp36-pypy36_pp73-manylinux2014_x86_64.whl", hash = "sha256:eb8cc2afe8b05acbd84a43905832ec78e7b3873fb124ca190f574dca7389a87d"}, + {file = "cryptography-3.4.7-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:7ec5d3b029f5fa2b179325908b9cd93db28ab7b85bb6c1db56b10e0b54235177"}, + {file = "cryptography-3.4.7-pp37-pypy37_pp73-manylinux2014_x86_64.whl", hash = "sha256:ee77aa129f481be46f8d92a1a7db57269a2f23052d5f2433b4621bb457081cc9"}, + {file = "cryptography-3.4.7.tar.gz", hash = "sha256:3d10de8116d25649631977cb37da6cbdd2d6fa0e0281d014a5b7d337255ca713"}, ] distlib = [ - {file = "distlib-0.3.1-py2.py3-none-any.whl", hash = "sha256:8c09de2c67b3e7deef7184574fc060ab8a793e7adbb183d942c389c8b13c52fb"}, - {file = "distlib-0.3.1.zip", hash = "sha256:edf6116872c863e1aa9d5bb7cb5e05a022c519a4594dc703843343a9ddd9bff1"}, + {file = "distlib-0.3.2-py2.py3-none-any.whl", hash = "sha256:23e223426b28491b1ced97dc3bbe183027419dfc7982b4fa2f05d5f3ff10711c"}, + {file = "distlib-0.3.2.zip", hash = "sha256:106fef6dc37dd8c0e2c0a60d3fca3e77460a48907f335fa28420463a6f799736"}, ] entrypoints = [ {file = "entrypoints-0.3-py2.py3-none-any.whl", hash = "sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19"}, @@ -1228,8 +1315,8 @@ httpretty = [ {file = "httpretty-0.9.7.tar.gz", hash = "sha256:66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe"}, ] identify = [ - {file = "identify-2.1.0-py2.py3-none-any.whl", hash = "sha256:2a5fdf2f5319cc357eda2550bea713a404392495961022cf2462624ce62f0f46"}, - {file = "identify-2.1.0.tar.gz", hash = "sha256:2179e7359471ab55729f201b3fdf7dc2778e221f868410fedcb0987b791ba552"}, + {file = "identify-2.2.13-py2.py3-none-any.whl", hash = "sha256:7199679b5be13a6b40e6e19ea473e789b11b4e3b60986499b1f589ffb03c217c"}, + {file = "identify-2.2.13.tar.gz", hash = "sha256:7bc6e829392bd017236531963d2d937d66fc27cadc643ac0aba2ce9f26157c79"}, ] idna = [ {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, @@ -1248,8 +1335,10 @@ ipaddress = [ {file = "ipaddress-1.0.23.tar.gz", hash = "sha256:b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2"}, ] jeepney = [ - {file = "jeepney-0.6.0-py3-none-any.whl", hash = "sha256:aec56c0eb1691a841795111e184e13cad504f7703b9a64f63020816afa79a8ae"}, - {file = "jeepney-0.6.0.tar.gz", hash = "sha256:7d59b6622675ca9e993a6bd38de845051d315f8b0c72cca3aef733a20b648657"}, + {file = "jeepney-0.4.3-py3-none-any.whl", hash = "sha256:d6c6b49683446d2407d2fe3acb7a368a77ff063f9182fe427da15d622adc24cf"}, + {file = "jeepney-0.4.3.tar.gz", hash = "sha256:3479b861cc2b6407de5188695fa1a8d57e5072d7059322469b62628869b8e36e"}, + {file = "jeepney-0.7.1-py3-none-any.whl", hash = "sha256:1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac"}, + {file = "jeepney-0.7.1.tar.gz", hash = "sha256:fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f"}, ] keyring = [ {file = "keyring-18.0.1-py2.py3-none-any.whl", hash = "sha256:7b29ebfcf8678c4da531b2478a912eea01e80007e5ddca9ee0c7038cb3489ec6"}, @@ -1271,10 +1360,10 @@ more-itertools = [ {file = "more-itertools-5.0.0.tar.gz", hash = "sha256:38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4"}, {file = "more_itertools-5.0.0-py2-none-any.whl", hash = "sha256:c0a5785b1109a6bd7fac76d6837fd1feca158e54e521ccd2ae8bfe393cc9d4fc"}, {file = "more_itertools-5.0.0-py3-none-any.whl", hash = "sha256:fe7a7cae1ccb57d33952113ff4fa1bc5f879963600ed74918f1236e212ee50b9"}, - {file = "more-itertools-8.6.0.tar.gz", hash = "sha256:b3a9005928e5bed54076e6e549c792b306fddfe72b2d1d22dd63d42d5d3899cf"}, - {file = "more_itertools-8.6.0-py3-none-any.whl", hash = "sha256:8e1a2a43b2f2727425f2b5839587ae37093f19153dc26c0927d1048ff6557330"}, - {file = "more-itertools-8.7.0.tar.gz", hash = "sha256:c5d6da9ca3ff65220c3bfd2a8db06d698f05d4d2b9be57e1deb2be5a45019713"}, - {file = "more_itertools-8.7.0-py3-none-any.whl", hash = "sha256:5652a9ac72209ed7df8d9c15daf4e1aa0e3d2ccd3c87f8265a0673cd9cbc9ced"}, + {file = "more-itertools-7.2.0.tar.gz", hash = "sha256:409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832"}, + {file = "more_itertools-7.2.0-py3-none-any.whl", hash = "sha256:92b8c4b06dac4f0611c0729b2f2ede52b2e1bac1ab48f089c7ddc12e26bb60c4"}, + {file = "more-itertools-8.8.0.tar.gz", hash = "sha256:83f0308e05477c68f56ea3a888172c78ed5d5b3c282addb67508e7ba6c8f813a"}, + {file = "more_itertools-8.8.0-py3-none-any.whl", hash = "sha256:2cf89ec599962f2ddc4d568a05defc40e0a587fbc10d5989713638864c36be4d"}, ] msgpack = [ {file = "msgpack-1.0.2-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:b6d9e2dae081aa35c44af9c4298de4ee72991305503442a5c74656d82b581fe9"}, @@ -1307,8 +1396,8 @@ msgpack = [ {file = "msgpack-1.0.2.tar.gz", hash = "sha256:fae04496f5bc150eefad4e9571d1a76c55d021325dcd484ce45065ebbdd00984"}, ] nodeenv = [ - {file = "nodeenv-1.5.0-py2.py3-none-any.whl", hash = "sha256:5304d424c529c997bc888453aeaa6362d242b6b4631e90f3d4bf1b290f1c84a9"}, - {file = "nodeenv-1.5.0.tar.gz", hash = "sha256:ab45090ae383b716c4ef89e690c41ff8c2b257b85b309f01f3654df3d084bd7c"}, + {file = "nodeenv-1.6.0-py2.py3-none-any.whl", hash = "sha256:621e6b7076565ddcacd2db0294c0381e01fd28945ab36bcf00f41c5daf63bef7"}, + {file = "nodeenv-1.6.0.tar.gz", hash = "sha256:3ef13ff90291ba2a4a7a4ff9a979b63ffdd00a464dbe04acf0ea6471517a4c2b"}, ] packaging = [ {file = "packaging-20.9-py2.py3-none-any.whl", hash = "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"}, @@ -1319,28 +1408,32 @@ pastel = [ {file = "pastel-0.2.1.tar.gz", hash = "sha256:e6581ac04e973cac858828c6202c1e1e81fee1dc7de7683f3e1ffe0bfd8a573d"}, ] pathlib2 = [ - {file = "pathlib2-2.3.5-py2.py3-none-any.whl", hash = "sha256:0ec8205a157c80d7acc301c0b18fbd5d44fe655968f5d947b6ecef5290fc35db"}, - {file = "pathlib2-2.3.5.tar.gz", hash = "sha256:6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868"}, + {file = "pathlib2-2.3.6-py2.py3-none-any.whl", hash = "sha256:3a130b266b3a36134dcc79c17b3c7ac9634f083825ca6ea9d8f557ee6195c9c8"}, + {file = "pathlib2-2.3.6.tar.gz", hash = "sha256:7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f"}, ] pexpect = [ {file = "pexpect-4.8.0-py2.py3-none-any.whl", hash = "sha256:0b48a55dcb3c05f3329815901ea4fc1537514d6ba867a152b581d69ae3710937"}, {file = "pexpect-4.8.0.tar.gz", hash = "sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c"}, ] pkginfo = [ - {file = "pkginfo-1.7.0-py2.py3-none-any.whl", hash = "sha256:9fdbea6495622e022cc72c2e5e1b735218e4ffb2a2a69cde2694a6c1f16afb75"}, - {file = "pkginfo-1.7.0.tar.gz", hash = "sha256:029a70cb45c6171c329dfc890cde0879f8c52d6f3922794796e06f577bb03db4"}, + {file = "pkginfo-1.7.1-py2.py3-none-any.whl", hash = "sha256:37ecd857b47e5f55949c41ed061eb51a0bee97a87c969219d144c0e023982779"}, + {file = "pkginfo-1.7.1.tar.gz", hash = "sha256:e7432f81d08adec7297633191bbf0bd47faf13cd8724c3a13250e51d542635bd"}, +] +platformdirs = [ + {file = "platformdirs-2.0.2-py2.py3-none-any.whl", hash = "sha256:0b9547541f599d3d242078ae60b927b3e453f0ad52f58b4d4bc3be86aed3ec41"}, + {file = "platformdirs-2.0.2.tar.gz", hash = "sha256:3b00d081227d9037bbbca521a5787796b5ef5000faea1e43fd76f1d44b06fcfa"}, ] pluggy = [ {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"}, ] poetry-core = [ - {file = "poetry-core-1.0.2.tar.gz", hash = "sha256:ff505d656a6cf40ffbf84393d8b5bf37b78523a15def3ac473b6fad74261ee71"}, - {file = "poetry_core-1.0.2-py2.py3-none-any.whl", hash = "sha256:ee0ed4164440eeab27d1b01bc7b9b3afdc3124f68d4ea28d0821a402a9c7c044"}, + {file = "poetry-core-1.0.4.tar.gz", hash = "sha256:4b3847ad3e7b5deb88a35b23fa19762b9cef26828770cef3a5b47ffb508119c1"}, + {file = "poetry_core-1.0.4-py2.py3-none-any.whl", hash = "sha256:a99fa921cf84f0521644714bb4b531d9d8f839c64de20aa71fa137f7461a1516"}, ] pre-commit = [ - {file = "pre_commit-2.10.1-py2.py3-none-any.whl", hash = "sha256:16212d1fde2bed88159287da88ff03796863854b04dc9f838a55979325a3d20e"}, - {file = "pre_commit-2.10.1.tar.gz", hash = "sha256:399baf78f13f4de82a29b649afd74bef2c4e28eb4f021661fc7f29246e8c7a3a"}, + {file = "pre_commit-2.14.0-py2.py3-none-any.whl", hash = "sha256:ec3045ae62e1aa2eecfb8e86fa3025c2e3698f77394ef8d2011ce0aedd85b2d4"}, + {file = "pre_commit-2.14.0.tar.gz", hash = "sha256:2386eeb4cf6633712c7cc9ede83684d53c8cafca6b59f79c738098b51c6d206c"}, ] ptyprocess = [ {file = "ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35"}, @@ -1355,8 +1448,8 @@ pycparser = [ {file = "pycparser-2.20.tar.gz", hash = "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"}, ] pylev = [ - {file = "pylev-1.3.0-py2.py3-none-any.whl", hash = "sha256:1d29a87beb45ebe1e821e7a3b10da2b6b2f4c79b43f482c2df1a1f748a6e114e"}, - {file = "pylev-1.3.0.tar.gz", hash = "sha256:063910098161199b81e453025653ec53556c1be7165a9b7c50be2f4d57eae1c3"}, + {file = "pylev-1.4.0-py2.py3-none-any.whl", hash = "sha256:7b2e2aa7b00e05bb3f7650eb506fc89f474f70493271a35c242d9a92188ad3dd"}, + {file = "pylev-1.4.0.tar.gz", hash = "sha256:9e77e941042ad3a4cc305dcdf2b2dec1aec2fbe3dd9015d2698ad02b173006d1"}, ] pyparsing = [ {file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"}, @@ -1369,8 +1462,8 @@ pytest = [ {file = "pytest-5.4.3.tar.gz", hash = "sha256:7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8"}, ] pytest-cov = [ - {file = "pytest-cov-2.11.1.tar.gz", hash = "sha256:359952d9d39b9f822d9d29324483e7ba04a3a17dd7d05aa6beb7ea01e359e5f7"}, - {file = "pytest_cov-2.11.1-py2.py3-none-any.whl", hash = "sha256:bdb9fdb0b85a7cc825269a4c56b48ccaa5c7e365054b6038772c32ddcdc969da"}, + {file = "pytest-cov-2.12.1.tar.gz", hash = "sha256:261ceeb8c227b726249b376b8526b600f38667ee314f910353fa318caa01f4d7"}, + {file = "pytest_cov-2.12.1-py2.py3-none-any.whl", hash = "sha256:261bb9e47e65bd099c89c3edf92972865210c36813f80ede5277dceb77a4a62a"}, ] pytest-mock = [ {file = "pytest-mock-1.13.0.tar.gz", hash = "sha256:e24a911ec96773022ebcc7030059b57cd3480b56d4f5d19b7c370ec635e6aed5"}, @@ -1390,18 +1483,26 @@ pyyaml = [ {file = "PyYAML-5.4.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185"}, {file = "PyYAML-5.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253"}, {file = "PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc"}, + {file = "PyYAML-5.4.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347"}, + {file = "PyYAML-5.4.1-cp36-cp36m-manylinux2014_s390x.whl", hash = "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541"}, {file = "PyYAML-5.4.1-cp36-cp36m-win32.whl", hash = "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5"}, {file = "PyYAML-5.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df"}, {file = "PyYAML-5.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018"}, {file = "PyYAML-5.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63"}, + {file = "PyYAML-5.4.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa"}, + {file = "PyYAML-5.4.1-cp37-cp37m-manylinux2014_s390x.whl", hash = "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0"}, {file = "PyYAML-5.4.1-cp37-cp37m-win32.whl", hash = "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b"}, {file = "PyYAML-5.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf"}, {file = "PyYAML-5.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46"}, {file = "PyYAML-5.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb"}, + {file = "PyYAML-5.4.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247"}, + {file = "PyYAML-5.4.1-cp38-cp38-manylinux2014_s390x.whl", hash = "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc"}, {file = "PyYAML-5.4.1-cp38-cp38-win32.whl", hash = "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc"}, {file = "PyYAML-5.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696"}, {file = "PyYAML-5.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77"}, {file = "PyYAML-5.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183"}, + {file = "PyYAML-5.4.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122"}, + {file = "PyYAML-5.4.1-cp39-cp39-manylinux2014_s390x.whl", hash = "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6"}, {file = "PyYAML-5.4.1-cp39-cp39-win32.whl", hash = "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10"}, {file = "PyYAML-5.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db"}, {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"}, @@ -1429,6 +1530,8 @@ scandir = [ ] secretstorage = [ {file = "SecretStorage-2.3.1.tar.gz", hash = "sha256:3af65c87765323e6f64c83575b05393f9e003431959c9395d1791d51497f29b6"}, + {file = "SecretStorage-3.2.0-py3-none-any.whl", hash = "sha256:ed5279d788af258e4676fa26b6efb6d335a31f1f9f529b6f1e200f388fac33e1"}, + {file = "SecretStorage-3.2.0.tar.gz", hash = "sha256:46305c3847ee3f7252b284e0eee5590fa6341c891104a2fd2313f8798c615a82"}, {file = "SecretStorage-3.3.1-py3-none-any.whl", hash = "sha256:422d82c36172d88d6a0ed5afdec956514b189ddbfb72fefab0c8a1cee4eaf71f"}, {file = "SecretStorage-3.3.1.tar.gz", hash = "sha256:fd666c51a6bf200643495a04abb261f83229dcb6fd8472ec393df7ffc8b6f195"}, ] @@ -1437,12 +1540,12 @@ shellingham = [ {file = "shellingham-1.4.0.tar.gz", hash = "sha256:4855c2458d6904829bd34c299f11fdeed7cfefbf8a2c522e4caea6cd76b3171e"}, ] singledispatch = [ - {file = "singledispatch-3.6.1-py2.py3-none-any.whl", hash = "sha256:85c97f94c8957fa4e6dab113156c182fb346d56d059af78aad710bced15f16fb"}, - {file = "singledispatch-3.6.1.tar.gz", hash = "sha256:58b46ce1cc4d43af0aac3ac9a047bdb0f44e05f0b2fa2eec755863331700c865"}, + {file = "singledispatch-3.7.0-py2.py3-none-any.whl", hash = "sha256:bc77afa97c8a22596d6d4fc20f1b7bdd2b86edc2a65a4262bdd7cc3cc19aa989"}, + {file = "singledispatch-3.7.0.tar.gz", hash = "sha256:c1a4d5c1da310c3fd8fccfb8d4e1cb7df076148fd5d858a819e37fffe44f3092"}, ] six = [ - {file = "six-1.15.0-py2.py3-none-any.whl", hash = "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"}, - {file = "six-1.15.0.tar.gz", hash = "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259"}, + {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, + {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, ] subprocess32 = [ {file = "subprocess32-3.5.4-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:88e37c1aac5388df41cc8a8456bb49ebffd321a3ad4d70358e3518176de3a56b"}, @@ -1457,29 +1560,30 @@ toml = [ {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, ] tomlkit = [ - {file = "tomlkit-0.7.0-py2.py3-none-any.whl", hash = "sha256:6babbd33b17d5c9691896b0e68159215a9387ebfa938aa3ac42f4a4beeb2b831"}, - {file = "tomlkit-0.7.0.tar.gz", hash = "sha256:ac57f29693fab3e309ea789252fcce3061e19110085aa31af5446ca749325618"}, + {file = "tomlkit-0.7.2-py2.py3-none-any.whl", hash = "sha256:173ad840fa5d2aac140528ca1933c29791b79a374a0861a80347f42ec9328117"}, + {file = "tomlkit-0.7.2.tar.gz", hash = "sha256:d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"}, ] tox = [ - {file = "tox-3.23.0-py2.py3-none-any.whl", hash = "sha256:e007673f3595cede9b17a7c4962389e4305d4a3682a6c5a4159a1453b4f326aa"}, - {file = "tox-3.23.0.tar.gz", hash = "sha256:05a4dbd5e4d3d8269b72b55600f0b0303e2eb47ad5c6fe76d3576f4c58d93661"}, + {file = "tox-3.24.2-py2.py3-none-any.whl", hash = "sha256:d45d39203b10fdb2f6887c6779865e31de82cea07419a739844cc4bd4b3493e2"}, + {file = "tox-3.24.2.tar.gz", hash = "sha256:ae442d4d51d5a3afb3711e4c7d94f5ca8461afd27c53f5dd994aba34896cf02d"}, ] typing = [ - {file = "typing-3.7.4.3-py2-none-any.whl", hash = "sha256:283d868f5071ab9ad873e5e52268d611e851c870a2ba354193026f2dfb29d8b5"}, - {file = "typing-3.7.4.3.tar.gz", hash = "sha256:1187fb9c82fd670d10aa07bbb6cfcfe4bdda42d6fab8d5134f04e8c4d0b71cc9"}, + {file = "typing-3.10.0.0-py2-none-any.whl", hash = "sha256:c7219ef20c5fbf413b4567092adfc46fa6203cb8454eda33c3fc1afe1398a308"}, + {file = "typing-3.10.0.0-py3-none-any.whl", hash = "sha256:12fbdfbe7d6cca1a42e485229afcb0b0c8259258cfb919b8a5e2a5c953742f89"}, + {file = "typing-3.10.0.0.tar.gz", hash = "sha256:13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130"}, ] typing-extensions = [ - {file = "typing_extensions-3.7.4.3-py2-none-any.whl", hash = "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"}, - {file = "typing_extensions-3.7.4.3-py3-none-any.whl", hash = "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918"}, - {file = "typing_extensions-3.7.4.3.tar.gz", hash = "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c"}, + {file = "typing_extensions-3.10.0.0-py2-none-any.whl", hash = "sha256:0ac0f89795dd19de6b97debb0c6af1c70987fd80a2d62d1958f7e56fcc31b497"}, + {file = "typing_extensions-3.10.0.0-py3-none-any.whl", hash = "sha256:779383f6086d90c99ae41cf0ff39aac8a7937a9283ce0a414e5dd782f4c94a84"}, + {file = "typing_extensions-3.10.0.0.tar.gz", hash = "sha256:50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342"}, ] urllib3 = [ {file = "urllib3-1.25.11-py2.py3-none-any.whl", hash = "sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e"}, {file = "urllib3-1.25.11.tar.gz", hash = "sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2"}, ] virtualenv = [ - {file = "virtualenv-20.4.2-py2.py3-none-any.whl", hash = "sha256:2be72df684b74df0ea47679a7df93fd0e04e72520022c57b479d8f881485dbe3"}, - {file = "virtualenv-20.4.2.tar.gz", hash = "sha256:147b43894e51dd6bba882cf9c282447f780e2251cd35172403745fc381a0a80d"}, + {file = "virtualenv-20.7.2-py2.py3-none-any.whl", hash = "sha256:e4670891b3a03eb071748c569a87cceaefbf643c5bac46d996c5a45c34aa0f06"}, + {file = "virtualenv-20.7.2.tar.gz", hash = "sha256:9ef4e8ee4710826e98ff3075c9a4739e2cb1040de6a2a8d35db0055840dc96a0"}, ] wcwidth = [ {file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"}, diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml index 02f6dabc86..eb55fd1227 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "poetry" -version = "1.1.5" +version = "1.1.8" description = "Python dependency management and packaging made easy." authors = [ "Sébastien Eustace " @@ -24,7 +24,7 @@ classifiers = [ [tool.poetry.dependencies] python = "~2.7 || ^3.5" -poetry-core = "~1.0.2" +poetry-core = "~1.0.4" cleo = "^0.8.1" clikit = "^0.6.2" crashtest = { version = "^0.3.0", python = "^3.6" } diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json index fcdb01e29c..abb6993d4c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json @@ -1,7 +1,7 @@ { "owner": "python-poetry", "repo": "poetry", - "rev": "a9704149394151f4d0d28cd5d8ee2283c7d10787", - "sha256": "0bv6irpscpak6pldkzrx4j12dqnpfz5h8fy5lliglizv0avh60hf", + "rev": "bce13c14f73060b3abbb791dea585d8fde26eaef", + "sha256": "H3Za2p5Sh+K7f2TEFV7vQpCEUyiGBNTu1clIi86Sj2E=", "fetchSubmodules": true } diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/update b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/update index 41866437aa..ac8c98a33d 100755 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/update +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/update @@ -16,7 +16,7 @@ mv poetry2nix-master/* . mkdir build cp *.* build/ cp -r pkgs hooks bin build/ -rm build/shell.nix build/generate.py build/overlay.nix build/flake.* +rm build/shell.nix build/generate.py build/overlay.nix build/flake.* build/check-fmt.nix cat > build/README.md << EOF Dont change these files here, they are maintained at https://github.com/nix-community/poetry2nix diff --git a/third_party/nixpkgs/pkgs/development/tools/postiats-utilities/default.nix b/third_party/nixpkgs/pkgs/development/tools/postiats-utilities/default.nix index f65d96382a..51d9d14efa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/postiats-utilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/postiats-utilities/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "postiats-utilities"; - version = "2.0.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "Hibou57"; repo = "PostiATS-Utilities"; rev = "v${version}"; - sha256 = "1238zp6sh60rdqbzff0w5c36w2z1jr44qnv43qidmcp19zvr7jd5"; + sha256 = "sha256-QeBbv5lwqL2ARjB+RGyBHeuibaxugffBLhC9lYs+5tE="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix b/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix index 657b196501..477827b75a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.63.0"; + version = "0.65.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-LYVR8vcMS6ErYH4sGRi1JT9E4ElYe5mloc3C1TudzSE="; + sha256 = "sha256-RIyxO2nTysJLdYQvlmhZpS8R2kkwN+XeTlk4Ocbk9C8="; }; - vendorSha256 = "sha256-3LuzdvwLYSL7HaGbKDfrqBz2FV2yr6YUdI5kXXiIvbU="; + vendorSha256 = "sha256-8zgWM5e+aKggGbLoL/Fmy7AuALVlLa74eHBxNGjTSy4="; meta = with lib; { homepage = "https://www.planetscale.com/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix b/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix index 94c706c021..e0c1722a61 100644 --- a/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "py-spy"; - version = "0.3.5"; + version = "0.3.8"; src = fetchFromGitHub { owner = "benfred"; repo = "py-spy"; rev = "v${version}"; - sha256 = "sha256-O6DbY/0ZI+BeG22jd9snbE718Y2vv7fqmeDdGWTnqfY="; + sha256 = "sha256-nb4ehJQGo6k4/gO2e54sBW1+eZ23jxgst142RPAn2jw="; }; NIX_CFLAGS_COMPILE = "-L${libunwind}/lib"; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { checkInputs = [ python3 ]; - cargoSha256 = "sha256-hmqrVGNu3zb109TQfhLI3wvGVnlc4CfbkrIKMfRSn7M="; + cargoSha256 = "sha256-qiK/LBRF6YCK1rhOlvK7g7BxF5G5zPgWJ3dM2Le0Yio="; meta = with lib; { description = "Sampling profiler for Python programs"; diff --git a/third_party/nixpkgs/pkgs/development/tools/pypi-mirror/default.nix b/third_party/nixpkgs/pkgs/development/tools/pypi-mirror/default.nix new file mode 100644 index 0000000000..cc90e41a47 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/pypi-mirror/default.nix @@ -0,0 +1,24 @@ +{ fetchFromGitHub +, lib +, python3 +}: +python3.pkgs.buildPythonApplication rec { + pname = "pypi-mirror"; + version = "4.0.6"; + + src = fetchFromGitHub { + owner = "montag451"; + repo = pname; + rev = "v${version}"; + sha256 = "0slh8ahywcgbggfcmzyqpb8bmq9dkk6vvjfkbi0ashnm8c6x19vd"; + }; + + pythonImportsCheck = [ "pypi_mirror" ]; + + meta = with lib; { + description = "A script to create a partial PyPI mirror"; + homepage = "https://github.com/montag451/pypi-mirror"; + license = licenses.mit; + maintainers = with maintainers; [ kamadorueda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix b/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix index 5926b3fda5..9df547308f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix @@ -68,7 +68,7 @@ mkDerivation rec { --replace 'LLVM_CXXFLAGS ~= s,-gsplit-dwarf,' '${lib.concatStringsSep "\n" ["LLVM_CXXFLAGS ~= s,-gsplit-dwarf," " LLVM_CXXFLAGS += -fno-rtti"]}' ''; - preBuild = optional withDocumentation '' + preBuild = optionalString withDocumentation '' ln -s ${getLib qtbase}/$qtDocPrefix $NIX_QT5_TMP/share ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/rakkess/default.nix b/third_party/nixpkgs/pkgs/development/tools/rakkess/default.nix new file mode 100644 index 0000000000..1f85917bff --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rakkess/default.nix @@ -0,0 +1,32 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "rakkess"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "corneliusweig"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-qDcSIpIS09OU2tYoBGq7BCXFkf9QWj07RvNKMjghrFU="; + }; + vendorSha256 = "sha256-1/8it/djhDjbWqe36VefnRu9XuwAa/qKpZT6d2LGpJ0="; + + ldflags = [ "-s" "-w" "-X github.com/corneliusweig/rakkess/internal/version.version=v${version}" ]; + + meta = with lib; { + homepage = "https://github.com/corneliusweig/rakkess"; + changelog = "https://github.com/corneliusweig/rakkess/releases/tag/v${version}"; + description = "Review Access - kubectl plugin to show an access matrix for k8s server resources"; + longDescription = '' + Have you ever wondered what access rights you have on a provided + kubernetes cluster? For single resources you can use + `kubectl auth can-i list deployments`, but maybe you are looking for a + complete overview? This is what rakkess is for. It lists access rights for + the current user and all server resources, similar to + `kubectl auth can-i --list`. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix index c183ddb760..15b6b085bb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; - version = "0.5.5"; + version = "0.5.7"; src = fetchFromGitHub { owner = "launchbadge"; repo = "sqlx"; rev = "v${version}"; - sha256 = "1051vldajdbkcxvrw2cig201c4nm68cvvnr2yia9f2ysmr68x5rh"; + sha256 = "sha256-BYTAAzex3h9iEKFuPCyCXKokPLcgA0k9Zk6aMcWac+c="; }; - cargoSha256 = "1ry893gjrwb670v80ff61yb00jvf49yp6194gqrjvnyarjc6bbb1"; + cargoSha256 = "sha256-3Fdoo8gvoLXe9fEAzKh7XY0LDVGsYsqB6NRlU8NqCMI="; doCheck = false; cargoBuildFlags = [ "-p sqlx-cli" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix index c440c83a80..cf4faa36b5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix @@ -2,18 +2,18 @@ let baseName = "scalafmt"; - version = "2.7.5"; + version = "3.0.0"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' export COURSIER_CACHE=$(pwd) - ${coursier}/bin/coursier fetch org.scalameta:scalafmt-cli_2.12:${version} > deps + ${coursier}/bin/coursier fetch org.scalameta:scalafmt-cli_2.13:${version} > deps mkdir -p $out/share/java cp $(< deps) $out/share/java/ ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1xvx9bd6lf9m1r5p05d37qnjlzny6xrbkh8m7z4q4rk7i1vl8xv0"; + outputHash = "fZVOyxswtDtCDDGmGzKbRnM5MVncKaicRKyEdPiXOr8="; }; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix index 6bfd2354a7..b162861f15 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-ocbZs4z6jxLC4l6po07QPyM7R5vFowK7hsMRfwALfoY="; + sha256 = "sha256-K+Zn+L7yylUj+iMrsXocWRD4O8HmxdsIsjO36SCkWiU="; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/so/default.nix b/third_party/nixpkgs/pkgs/development/tools/so/default.nix index e7324ff7c5..a23fa445c2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/so/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/so/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "so"; - version = "0.4.3"; + version = "0.4.5"; src = fetchFromGitHub { owner = "samtay"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WAUPB4hhvroE1/8nQcgLVWgGyXcFh7qxdFg6UtQzM9A="; + sha256 = "sha256-KiIffq8olpNpynmV4lwdY0yu2ch4MAwp5VspfLZtkf4="; }; - cargoSha256 = "sha256-aaIzGvf+PvH8nz2BSJapi1P5gSVfXT92X62FqJ1Z2L0="; + cargoSha256 = "sha256-VBuWKit50cSHYg7WzUP5ein3MEoZN/KFfm+YEEu544Q="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix b/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix index 8219487f55..3259a5fc41 100644 --- a/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix @@ -3,16 +3,16 @@ let platform = if stdenv.hostPlatform.system == "x86_64-linux" then { name = "x86_64-unknown-linux-musl"; - sha256 = "sha256-pttjlx7WWE3nog9L1APp8HN+a4ShhlBj5irHOaPgqHw="; + sha256 = "sha256-uy3+/+XMq56rO75mmSeOmE1HW7hhefaGwfY/QJPk3Ok="; } else if stdenv.hostPlatform.system == "x86_64-darwin" then { name = "x86_64-apple-darwin"; - sha256 = "sha256-Vxmhl4/bhRDeByGgkdSF8yEY5wI23WzT2iH1OFkEpck="; + sha256 = "sha256-EK7FbRzgaCXviOuBcRf/ElllRdakhDmOLsKkwrIEhBU="; } 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"; + version = "3.5.49"; src = fetchurl { url = "https://update.tabnine.com/bundles/${version}/${platform.name}/TabNine.zip"; diff --git a/third_party/nixpkgs/pkgs/development/tools/taplo-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/taplo-cli/default.nix index 3145131005..4ad539e709 100644 --- a/third_party/nixpkgs/pkgs/development/tools/taplo-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/taplo-cli/default.nix @@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://taplo.tamasfe.dev"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "taplo"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 24ef1e8575..0822e1ee63 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -105,7 +105,8 @@ in rec { in stdenv.mkDerivation { inherit preBuild postBuild name; - phases = ["configurePhase" "buildPhase"]; + dontUnpack = true; + dontInstall = true; buildInputs = [ yarn nodejs git ] ++ extraBuildInputs; configurePhase = '' diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix index e58a7d9295..a82542760c 100644 --- a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "8.2.0"; + version = "8.3.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "0j5acj7ghqf2pywpf4vzzvmcn4ypc4gv0pjyjd8hgzrrl3kff4dm"; + sha256 = "sha256-MmdAi/AZ4CI/dPWbJxAXYTg/h0Dr/eEVYcZLMHaDQQ0="; }; # don't remove runtime deps diff --git a/third_party/nixpkgs/pkgs/development/web/postman/default.nix b/third_party/nixpkgs/pkgs/development/web/postman/default.nix index 6eb7eb1b58..abcf6bfc16 100644 --- a/third_party/nixpkgs/pkgs/development/web/postman/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/postman/default.nix @@ -2,16 +2,16 @@ , atk, at-spi2-atk, at-spi2-core, alsa-lib, cairo, cups, dbus, expat, gdk-pixbuf, glib, gtk3 , freetype, fontconfig, nss, nspr, pango, udev, libuuid, libX11, libxcb, libXi , libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes -, libXrender, libXtst, libXScrnSaver, libdrm, mesa +, libXrender, libXtst, libXScrnSaver, libxkbcommon, libdrm, mesa }: stdenv.mkDerivation rec { pname = "postman"; - version = "8.4.0"; + version = "8.10.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "040l0g6m8lmjrm0wvq8z13xyddasz7v95v54d658w14gv0n713vw"; + sha256 = "05f3eaa229483a7e1f698e6e2ea2031d37687de540d4fad05ce677ac216db24d"; name = "${pname}.tar.gz"; }; @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { libXrender libXtst libXScrnSaver + libxkbcommon ]; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/games/atanks/default.nix b/third_party/nixpkgs/pkgs/games/atanks/default.nix index f92f2e19c3..197cadfea2 100644 --- a/third_party/nixpkgs/pkgs/games/atanks/default.nix +++ b/third_party/nixpkgs/pkgs/games/atanks/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atanks"; - version = "6.5"; + version = "6.6"; src = fetchurl { url = "mirror://sourceforge/project/atanks/atanks/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0bijsbd51j4wsnmdxj54r92m7h8zqnvh9z3qqdig6zx7a8kjn61j"; + sha256 = "sha256-vGse/J/H52JPrR2DUtcuknvg+6IWC7Jbtri9bGNwv0M="; }; buildInputs = [ allegro ]; diff --git a/third_party/nixpkgs/pkgs/games/cataclysm-dda/common.nix b/third_party/nixpkgs/pkgs/games/cataclysm-dda/common.nix index d91db073ff..ccba8e23d5 100644 --- a/third_party/nixpkgs/pkgs/games/cataclysm-dda/common.nix +++ b/third_party/nixpkgs/pkgs/games/cataclysm-dda/common.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation { ''; homepage = "https://cataclysmdda.org/"; license = licenses.cc-by-sa-30; - maintainers = with maintainers; [ mnacamura ]; + maintainers = with maintainers; [ mnacamura DeeUnderscore ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/games/cataclysm-dda/stable.nix b/third_party/nixpkgs/pkgs/games/cataclysm-dda/stable.nix index ba475ac960..a11837447f 100644 --- a/third_party/nixpkgs/pkgs/games/cataclysm-dda/stable.nix +++ b/third_party/nixpkgs/pkgs/games/cataclysm-dda/stable.nix @@ -10,15 +10,20 @@ let }; self = common.overrideAttrs (common: rec { - version = "0.F"; + version = "0.F-1"; src = fetchFromGitHub { owner = "CleverRaven"; repo = "Cataclysm-DDA"; rev = version; - sha256 = "1jid8lcl04y768b3psj1ifhx96lmd6fn1j2wzxhl4ic7ra66p2z3"; + sha256 = "sha256-bVIln8cLZ15qXpW5iB8Odqk0OQbNLLM8OiKybTzARA0="; }; + makeFlags = common.makeFlags ++ [ + # Makefile declares version as 0.F, even under 0.F-1 + "VERSION=${version}" + ]; + meta = common.meta // { maintainers = with lib.maintainers; common.meta.maintainers ++ [ skeidel ]; diff --git a/third_party/nixpkgs/pkgs/games/factorio/versions.json b/third_party/nixpkgs/pkgs/games/factorio/versions.json index acbc0c4cbc..a8e395b273 100644 --- a/third_party/nixpkgs/pkgs/games/factorio/versions.json +++ b/third_party/nixpkgs/pkgs/games/factorio/versions.json @@ -2,20 +2,20 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.37.tar.xz", + "name": "factorio_alpha_x64-1.1.38.tar.xz", "needsAuth": true, - "sha256": "0aj8w38lx8bx3d894qxr416x515ijadrlcynvvqjaj1zx3acldzh", + "sha256": "0cjhfyz4j06yn08n239ajjjpgykh39hzifhmd0ygr5szw9gdc851", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.37/alpha/linux64", - "version": "1.1.37" + "url": "https://factorio.com/get-download/1.1.38/alpha/linux64", + "version": "1.1.38" }, "stable": { - "name": "factorio_alpha_x64-1.1.37.tar.xz", + "name": "factorio_alpha_x64-1.1.38.tar.xz", "needsAuth": true, - "sha256": "0aj8w38lx8bx3d894qxr416x515ijadrlcynvvqjaj1zx3acldzh", + "sha256": "0cjhfyz4j06yn08n239ajjjpgykh39hzifhmd0ygr5szw9gdc851", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.37/alpha/linux64", - "version": "1.1.37" + "url": "https://factorio.com/get-download/1.1.38/alpha/linux64", + "version": "1.1.38" } }, "demo": { @@ -28,30 +28,30 @@ "version": "1.1.37" }, "stable": { - "name": "factorio_demo_x64-1.1.37.tar.xz", + "name": "factorio_demo_x64-1.1.38.tar.xz", "needsAuth": false, - "sha256": "06qwx9wd3990d3256y9y5qsxa0936076jgwhinmrlvjp9lxwl4ly", + "sha256": "0y53w01dyfmavw1yxbjqjiirmvw32bnf9bqz0isnd72dvkg0kziv", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.37/demo/linux64", - "version": "1.1.37" + "url": "https://factorio.com/get-download/1.1.38/demo/linux64", + "version": "1.1.38" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.37.tar.xz", + "name": "factorio_headless_x64-1.1.38.tar.xz", "needsAuth": false, - "sha256": "0hawwjdaxgbrkb80vn9jk6dn0286mq35zkgg5vvv5zhi339pqwwg", + "sha256": "1c929pa9ifz0cvmx9k5yd267hjd5p7fdbln0czl3dq1vlskk1w71", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.37/headless/linux64", - "version": "1.1.37" + "url": "https://factorio.com/get-download/1.1.38/headless/linux64", + "version": "1.1.38" }, "stable": { - "name": "factorio_headless_x64-1.1.37.tar.xz", + "name": "factorio_headless_x64-1.1.38.tar.xz", "needsAuth": false, - "sha256": "0hawwjdaxgbrkb80vn9jk6dn0286mq35zkgg5vvv5zhi339pqwwg", + "sha256": "1c929pa9ifz0cvmx9k5yd267hjd5p7fdbln0czl3dq1vlskk1w71", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.37/headless/linux64", - "version": "1.1.37" + "url": "https://factorio.com/get-download/1.1.38/headless/linux64", + "version": "1.1.38" } } } diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix index 99f188c747..0af9968f20 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.720.0"; + version = "2021.815.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "I7UkbyH2i218d5RCq4al9Gr1C0MX339jFOeyKrKQ3b0="; + sha256 = "z5z/BKi9W4i7fbDmzKUscyNByDwe4nJXyUED8SROCrg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix index 533f114d5f..c037a2dcf8 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -57,24 +57,25 @@ (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 = "JetBrains.Annotations"; version = "2021.2.0"; sha256 = "0krvmg2h5ibh6mzs9yn7c8cdxgvr5hm7l884i49hlhnc1aiy5m1n"; }) + (fetchNuGet { name = "ManagedBass"; version = "3.0.0"; sha256 = "1yh1s36w465z8gcj4xs6q048g63z7m3nyfy1vvw1lgh7k6hqqgma"; }) + (fetchNuGet { name = "ManagedBass.Fx"; version = "3.0.0"; sha256 = "0sck1wmjlcy8q941bamk1i0k4yrklyilsgg6c832xdh96sdc049s"; }) + (fetchNuGet { name = "ManagedBass.Mix"; version = "3.0.0"; sha256 = "0brnm0ry96b81hgffbaj52s53bsn9c8cx4q24j0whsvmcqqxhs4v"; }) (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 = "MessagePack"; version = "2.3.75"; sha256 = "0mcpxym6g47lyfalnr27mmavmgmd46k6f9g7id8cn1anbbvd4xv1"; }) + (fetchNuGet { name = "MessagePack.Annotations"; version = "2.3.75"; sha256 = "06a1ys161gvw1sr771w909gwd1y4dizdvldknkhy8484drj90prd"; }) (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.AspNetCore.Connections.Abstractions"; version = "5.0.8"; sha256 = "13k0p0k1gqk12hnxj4l5yjbyv8y51ggkybrqjjr3yf3411vyy4q2"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Client"; version = "5.0.8"; sha256 = "0rladdnd7g8gh7hj5gbrcp3dlspngad4xhgk0qmpzhlc3qr4snf2"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Common"; version = "5.0.8"; sha256 = "03d2ydy7zap5hri7k1f30d1i9jaqj0nijwgp2z6b36gwqck9rys7"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Features"; version = "5.0.8"; sha256 = "1amyhi7m2g3al3ams5fdzqk9xablw14vfpvn819mym1ml1y6lbb7"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Client"; version = "5.0.8"; sha256 = "0a25gzp6p5ii0p4g9n1vlsc085bvy7m02cdpyb2zxl10iggzqj57"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "5.0.8"; sha256 = "09yaqai0ld25p27nndw9bg7p0vm11y4jc00xcl3vh0jb0lqhkznf"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Common"; version = "5.0.8"; sha256 = "0j1wa67n22gbwswn8457m3cl6jw099wn84qxj9qsrsylv4md58n6"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "5.0.8"; sha256 = "1nms7rs157njhh0lvkhk4hv5i6ds54jx5fw5iy2jwa7qajic1yjv"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "5.0.8"; sha256 = "02rbz3wlfq8bnd4h7d0pd2f9lvpcyjf7ak73wbl8y0fi19xda07i"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "5.0.8"; sha256 = "1qwn1263jxc90mbapfkr4a1238q76clv2c38n0w3ybdxy3md8n34"; }) (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"; }) @@ -109,7 +110,7 @@ (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"; version = "5.0.2"; sha256 = "0db6d1b076nfqfn5mhy63l3gkfn5kr29hwcrx81ldr7y062r1b9y"; }) (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"; }) @@ -117,7 +118,7 @@ (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.ObjectPool"; version = "5.0.8"; sha256 = "06hfa4crnmf72rw1znqw2fmknshsjnvaa3xgmw4kswd3y622ljxg"; }) (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"; }) @@ -155,12 +156,13 @@ (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.LocalisationAnalyser"; version = "2021.725.0"; sha256 = "00nvk8kw94v0iq5k7y810sa235lqdjlggq7f00c64c3d1zam4203"; }) + (fetchNuGet { name = "ppy.ManagedBass"; version = "3.1.3-alpha"; sha256 = "0qdrklalp42pbyb30vpr7c0kwjablsja0s6xplxxkpfd14y8mzk4"; }) + (fetchNuGet { name = "ppy.osu.Framework"; version = "2021.813.0"; sha256 = "1zwx2jq6r1xcp72f484nhicmf472pad84p2hxwhli7xczq0n0fbc"; }) + (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; version = "2021.805.0"; sha256 = "004c053s6p7339bfw68lvlyk9jkbw6djkf2d72dz8wam546k8dcl"; }) + (fetchNuGet { name = "ppy.osu.Game.Resources"; version = "2021.813.0"; sha256 = "1g7f15khni624024c87cx0hihpd4syl1vss8nyrxqmkqqlif6da1"; }) + (fetchNuGet { name = "ppy.osuTK.NS20"; version = "1.0.177"; sha256 = "0l5if7phd0pvnsvqlbzaz5bizxb6w2i412wyc0wfcrl3p6pm4y7m"; }) + (fetchNuGet { name = "ppy.SDL2-CS"; version = "1.0.367-alpha"; sha256 = "0mg45c81wzxdr7v4kygmvgipgs1s24v3bkyn64c0xl1vb015l2bx"; }) (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"; }) @@ -185,7 +187,7 @@ (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 = "Sentry"; version = "3.8.3"; sha256 = "0ymr3f36illxk2949nfyd91anw46n19wd1rl1id4l6yql9fl6b30"; }) (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"; }) diff --git a/third_party/nixpkgs/pkgs/games/pioneer/default.nix b/third_party/nixpkgs/pkgs/games/pioneer/default.nix index 51eda72bde..cd827131a7 100644 --- a/third_party/nixpkgs/pkgs/games/pioneer/default.nix +++ b/third_party/nixpkgs/pkgs/games/pioneer/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { export PIONEER_DATA_DIR="$out/share/pioneer/data"; ''; + makeFlags = [ "build-data" ]; + meta = with lib; { description = "A space adventure game set in the Milky Way galaxy at the turn of the 31st century"; homepage = "https://pioneerspacesim.net"; diff --git a/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix b/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix index 0d0b03f514..c8882349ce 100644 --- a/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix +++ b/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vkquake"; - version = "1.05.2"; + version = "1.05.3"; src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; rev = version; - sha256 = "sha256-h4TpeOwCK3Ynd+XZKo7wHncWS1OI6+b9SReD5xMK9zk="; + sha256 = "sha256-nrqxfJbTkaPgKozkS6ulUZNXymkpw0bbQBHUZEFnLhs="; }; sourceRoot = "source/Quake"; diff --git a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix index ec18a26829..e67a9f6d47 100644 --- a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix @@ -10,23 +10,23 @@ let pname = "shattered-pixel-dungeon"; - version = "0.9.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; # NOTE: always use the commit sha, not the tag. Tags _will_ disappear! # https://github.com/00-Evan/shattered-pixel-dungeon/issues/596 - rev = "785c869f2b61013a15fddbf5f0c65d67fe900e80"; - sha256 = "sha256-d7Fc1IPOW/0RwLYe9vwaD3gFw6div2/J0DOFdWYDXWY="; + rev = "1f296a2d1088ad35421f5f8040a9f0803fa46ba8"; + sha256 = "sha256-MzHdUAzCR2JtIdY1SGuge3xgR6qIhNYxUPOxA+TZtLE="; }; postPatch = '' # disable gradle plugins with native code and their targets perl -i.bak1 -pe "s#(^\s*id '.+' version '.+'$)#// \1#" build.gradle - perl -i.bak2 -pe "s#(.*)#// \1# if /^(buildscript|task portable|task nsis|task proguard|task tgz|task\(afterEclipseImport\)|launch4j|macAppBundle|buildRpm|buildDeb|shadowJar)/ ... /^}/" build.gradle - # Remove unbuildable android stuff - rm android/build.gradle + perl -i.bak2 -pe "s#(.*)#// \1# if /^(buildscript|task portable|task nsis|task proguard|task tgz|task\(afterEclipseImport\)|launch4j|macAppBundle|buildRpm|buildDeb|shadowJar|robovm)/ ... /^}/" build.gradle + # Remove unbuildable Android/iOS stuff + rm android/build.gradle ios/build.gradle ''; # fake build to pre-download deps into fixed-output derivation @@ -46,9 +46,8 @@ let | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ | sh ''; - outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0ih10c6c85vhrqgilqmkzqjx3dc8cscvs9wkh90zgdj10qv0iba3"; + outputHash = "sha256-0P/BcjNnbDN25DguRcCyzPuUG7bouxEx1ySodIbSwvg="; }; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/games/spring/default.nix b/third_party/nixpkgs/pkgs/games/spring/default.nix index 21aca57306..b6e6505fd0 100644 --- a/third_party/nixpkgs/pkgs/games/spring/default.nix +++ b/third_party/nixpkgs/pkgs/games/spring/default.nix @@ -7,9 +7,9 @@ stdenv.mkDerivation rec { pname = "spring"; - version = "104.0.1-${buildId}-g${shortRev}"; + version = "105.0.1-${buildId}-g${shortRev}"; # usually the latest in https://github.com/spring/spring/commits/maintenance - rev = "f266c8107b3e5dda5a78061ef00ca0ed8736d6f2"; + rev = "8581792eac65e07cbed182ccb1e90424ce3bd8fc"; shortRev = builtins.substring 0 7 rev; buildId = "1486"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "spring"; repo = pname; inherit rev; - sha256 = "1nx68d894yfmqc6df72hmk75ph26fqdvlmmq58cca0vbwpz9hf5v"; + sha256 = "05lvd8grqmv7vl8rrx02rhl0qhmm58dyi6s78b64j3fkia4sfj1r"; fetchSubmodules = true; }; @@ -60,7 +60,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ phreedom qknight domenkozar sorki ]; platforms = platforms.linux; - # error: 'snprintf' was not declared in this scope - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/games/warzone2100/default.nix b/third_party/nixpkgs/pkgs/games/warzone2100/default.nix index 6f31dcf9be..3d811f50d4 100644 --- a/third_party/nixpkgs/pkgs/games/warzone2100/default.nix +++ b/third_party/nixpkgs/pkgs/games/warzone2100/default.nix @@ -39,11 +39,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.1.1"; + version = "4.1.3"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "sha256-CnMt3FytpTDAtibU3V24i6EvWRc9UkAuvC9ingphCM8="; + sha256 = "sha256-sKZiDjWwVFXT6RiY+zT+0S6Zb3uCC0CaZzOQYEWpWNs="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/misc/emulators/proton-caller/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/proton-caller/default.nix index a69c1b3763..0c3b786c11 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/proton-caller/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/proton-caller/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "proton-caller"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "caverym"; repo = pname; rev = version; - sha256 = "1rj0f8jzmrvj6gz1rcdjmxdqk2i5cxhz9ji4217kwyb6h1h0jmdk"; + sha256 = "sha256-GFZX+ss6LRosCsOuzjLu15BCdImhxH2D2kZQzF8zA90="; }; - cargoSha256 = "165kzza1m8h37y1ir0d0hp0z645h4ihkyj83fii69f18gk47r3kg"; + cargoSha256 = "sha256-8HaMmvSUI5Zttlsx5tewwIR+iKBlp4w8XlRfI0tyBas="; meta = with lib; { description = "Run Windows programs with Proton"; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 24b60ea1d9..819c4ae469 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -437,12 +437,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-08-16"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "80f2d03b1d7d8a5032689a17c9a234d464a67405"; - sha256 = "0k5v490p22j3ghfb6c436z0i3fq18sj0y4x01axrl4iy1jpwn3v2"; + rev = "69544e754415ff9788e8ed55fa89ab23554b2526"; + sha256 = "1p73am7r6740k4l7vyndcd2pxdx9qpyicp8f07lcx950k4qq7yr2"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -519,6 +519,18 @@ final: prev: meta.homepage = "https://github.com/bbchung/clighter8/"; }; + cmd-parser-nvim = buildVimPluginFrom2Nix { + pname = "cmd-parser-nvim"; + version = "2021-05-30"; + src = fetchFromGitHub { + owner = "winston0410"; + repo = "cmd-parser.nvim"; + rev = "70813af493398217cb1df10950ae8b99c58422db"; + sha256 = "0rfa8cpykarcal8qcfp1dax1kgcbq7bv1ld6r1ia08n9vnqi5vm6"; + }; + meta.homepage = "https://github.com/winston0410/cmd-parser.nvim/"; + }; + cmp-buffer = buildVimPluginFrom2Nix { pname = "cmp-buffer"; version = "2021-08-11"; @@ -567,6 +579,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; + cmp-nvim-lua = buildVimPluginFrom2Nix { + pname = "cmp-nvim-lua"; + version = "2021-08-17"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-nvim-lua"; + rev = "6bcd10433e48dc50f5330d113bd6ec6647f128dc"; + sha256 = "1nkncgrp95li2403wkcph1bglcdnlbj2pjybqx5rp27pazpi5rga"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lua/"; + }; + cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; version = "2021-08-09"; @@ -677,12 +701,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-08-16"; + version = "2021-08-18"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "1296df441756a5249319369640f208089a10efe4"; - sha256 = "1p6gikl6fw6fvbb7f76mb88ckcw6vp4llzz601k0f6rrna4xhjab"; + rev = "e141be935e45800947f4f88ea89a2067c5d7b47f"; + sha256 = "0k2ll4vcjsj8xak4ki9h6m89rkhzdb0d70n4p34hhajf6li4lbfc"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -930,12 +954,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-08-13"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "46b4fe60778064d7924534c9658d29858d7d67a7"; - sha256 = "16fmzn4vf7ha63r73ra2lpdww1hmg2jnr88bpw2in3c8id6df2rd"; + rev = "358747255db85579498dfc6e03dcd808d5b81d34"; + sha256 = "086q1bx6xz3qzkyll6lszcgljyz8b5w4ywa8wvcv71al3cxd9n7b"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1038,12 +1062,12 @@ final: prev: dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2021-04-05"; + version = "2021-08-17"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "d874c13dca7300178546de62e1aff7d4812640c7"; - sha256 = "1i1w9mwmrl6cds83mai1xyqrqmzbgal2whw653g54sz1gvnhab7s"; + rev = "08764627ce85fc0c0bf9d8fd11b3cf5fc05d58ba"; + sha256 = "0fqjgnpc6zajqr4pd3hf73fg0cjx7cnkhz6cjdf5mvjwllgv92gp"; }; meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; @@ -1086,12 +1110,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2021-08-08"; + version = "2021-08-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "d4bf081bc6bdf062097fddbbcf9c8fdf5b8fb101"; - sha256 = "1sdkfij72z068h2fnhay1ppmf9my32jgzr1pf8liqs6647l90i1v"; + rev = "7e506d4b8cea834ef7e61a1f694540c5da418a25"; + sha256 = "16lg72l4zixhmd7pf8aliw3gwz2m25z90h8phmjj3d93w2g4q8zd"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1134,24 +1158,24 @@ final: prev: denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-07-13"; + version = "2021-08-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "29ece0ca76408c191e3c5ed997b239efb4b38f58"; - sha256 = "02s43lyqb17066wjjcl29vyky76svzaddclh1q6jh2awhixpsqx2"; + rev = "72871ae8f4e75e0271e096b4c37854dde49012d8"; + sha256 = "07n8pda0y7hn38xv94w8gzmf0qn4l8sbp0hviznknc0jmch1rxvd"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2021-07-13"; + version = "2021-08-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "df506505ab2de577b35271a2b222042000a30381"; - sha256 = "0hqfbbcq4bnc48bknd7lfm41djq6977s18j14kyanp9gm7851sis"; + rev = "a2c6bbcf4125c9256773c1c8cfb48b4179686e77"; + sha256 = "04afx7hfch9vyvm2s2i93vylk5ar1sjc8sdqszqqj7fnlz53f8db"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1787,12 +1811,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-08-12"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "276abeaf7a350724ca948f1c21de0b12d3cedc4f"; - sha256 = "1lbm98ijihmikazjm0a7cckqlc7c32bsqzqk077wbigkx559zam9"; + rev = "2d7bcab215c8b7a8f889b371c4060dda2a6c6541"; + sha256 = "0kxm6nl167b51gjwli64d9qp5s1cdy9za0zfq9hy8phivjk2pmyl"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1859,12 +1883,12 @@ final: prev: fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2021-05-25"; + version = "2021-08-17"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "e34f6c129d39b90db44df1107c8b7dfacfd18946"; - sha256 = "0rn0b48zxf46ak0a2dwbx4aas0fjiywhch0viffzhj5b61lvy218"; + rev = "b1afeca8cc02030f450bf1feee015d40988f86e3"; + sha256 = "1kf0lyacv45s837533aisvzkfyg53gq8q04djq4a0hnsjfzra1p5"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1967,12 +1991,12 @@ final: prev: git-worktree-nvim = buildVimPluginFrom2Nix { pname = "git-worktree-nvim"; - version = "2021-08-13"; + version = "2021-08-18"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "git-worktree.nvim"; - rev = "35007615f75262a6b411e11e8928e504af7ebb5e"; - sha256 = "1kh7nvvb8nrgqnp2h78v5s7swa71xrbj4q3k2xrsiz11s16q72hn"; + rev = "57359f59bfa391360744236c6ca01f38374257fd"; + sha256 = "1v0wqzp6sp214m83hy2fxx59b0h5lihfw3rkrvk07hixi3qg71dm"; }; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; @@ -2007,8 +2031,8 @@ final: prev: src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "7875d8c4d94f98f7a1a65b898499fa288e7969b3"; - sha256 = "13hzghpzglw6cr4hwsp7qvp6a7dkh2fk2sg4nzzazgmfych485cm"; + rev = "70705a33ab816c61011ed9c97ebb5925eaeb89c1"; + sha256 = "1bcrba17icpdmk69p284kb2k3jpwimnbcn5msa7xq46wj97hy12k"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2039,14 +2063,14 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow-nvim"; - version = "2021-07-14"; + version = "2021-08-19"; src = fetchFromGitHub { - owner = "npxbr"; + owner = "ellisonleao"; repo = "glow.nvim"; - rev = "3688c38b70eaa680a7100a53e2f12bcd367de225"; - sha256 = "18xkgwy3gfaq45wzixpr3ngskqqg0c2nziykvy323fimjvbvqxan"; + rev = "bee0d2db015f8499d2102367f2c60154b38ee7c2"; + sha256 = "0racy87lqhalw26m9m2ikc002j263jlnnpn77aryc0hn5rh9dhsd"; }; - meta.homepage = "https://github.com/npxbr/glow.nvim/"; + meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; golden-ratio = buildVimPluginFrom2Nix { @@ -2111,24 +2135,24 @@ final: prev: gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2021-05-17"; + version = "2021-08-18"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "51ae4557e8941943d70da36320cc80a521e2d99e"; - sha256 = "0dgvd4qpzg7fn7rwvpknzi2bxzzb2g8jl9jh9byj07yll413gzqh"; + rev = "f29a88b5e16c8a6c8e774ba06854b2832bef50b1"; + sha256 = "1p6103h8ac60c7lzlnn71kp6xrpzkmnh4nrw69s3p91mfbp73hxb"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; gruvbox-flat-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-flat-nvim"; - version = "2021-06-25"; + version = "2021-08-17"; src = fetchFromGitHub { owner = "eddyekofo94"; repo = "gruvbox-flat.nvim"; - rev = "b98cd51a564881eac30794e64a8db63860d9bcf0"; - sha256 = "03drq3sqak2lcb7vs7qw1lhgrbnri0m1qp50cgaq17v0dlk15n4k"; + rev = "9f02570bf323e9484b6f04ad96adc3103a075662"; + sha256 = "1dw4mm1ksclhx7ys88z2g0481j9xxd95qi1jlma8l5cyjfzdkrkz"; }; meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/"; }; @@ -2147,14 +2171,14 @@ final: prev: gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-nvim"; - version = "2021-07-26"; + version = "2021-08-19"; src = fetchFromGitHub { - owner = "npxbr"; + owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "05da7d5a8199522c27ad746e655593b5933fe5d0"; - sha256 = "1dnpc83sv49gs5i9xbyj7m0cgfbjahsy5fxpgy5a79yj0czphid7"; + rev = "24494189e723b71c1683c58ecfd0825d202b2bf8"; + sha256 = "1zv7gmq8q5qszb2pxfiwkzwbm4yk2zbrly1whv2kpymlik37i7as"; }; - meta.homepage = "https://github.com/npxbr/gruvbox.nvim/"; + meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; gundo-vim = buildVimPluginFrom2Nix { @@ -2530,6 +2554,18 @@ final: prev: meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; + kommentary = buildVimPluginFrom2Nix { + pname = "kommentary"; + version = "2021-08-17"; + src = fetchFromGitHub { + owner = "b3nj5m1n"; + repo = "kommentary"; + rev = "a5d7cd90059ad99b5e80a1d40d655756d86b5dad"; + sha256 = "1bgi9dzzlw09llyq09jgnyg7n64s1nk5s5knlkhijrhsw0jmxjkk"; + }; + meta.homepage = "https://github.com/b3nj5m1n/kommentary/"; + }; + kotlin-vim = buildVimPluginFrom2Nix { pname = "kotlin-vim"; version = "2021-07-03"; @@ -2616,12 +2652,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-08-16"; + version = "2021-08-18"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "303f4a17f06b41c99210afaa6b21a7a16da533db"; - sha256 = "0rp1nc4hghn0i7ipbd6n0ja3zb5zv44pm9snfwlai2p5c8awi39z"; + rev = "bafe5cda6371035220ec7c12351e6922afd691b3"; + sha256 = "13naynadf8ahz85k7wm9rmcl3mxrc8d1q0lnr23xraksbhv72lg5"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -2688,24 +2724,24 @@ final: prev: lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; - version = "2021-03-09"; + version = "2021-08-18"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "73efae0e97b8c661bf36d3637c3ba1ee02b4fe07"; - sha256 = "122jhh3vkapxz42sa6l9sdxcdl4fzq4xfrjmaak815nvf3bg249a"; + rev = "0b687d63afc771d5ddce3aa175b9ab4b012f9715"; + sha256 = "0nhvibvizczk8bp4lc4g9mndhwp240bh8adcq840zf3lghpnlkh4"; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2021-08-11"; + version = "2021-08-18"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "d13642f7a2a4f82da9cb00949ad0163bf5d61e04"; - sha256 = "086f66wkyngcy5x0wmhdi9abna9pq5m6cl0ic2kvdxpbgdl7qc2q"; + rev = "aa8e8f270c1d3be4fbe6b153827a191a5fcaa0d7"; + sha256 = "0lgpxgg2696pbfdgnr2zcapvhfk6d1qwvci223h69rvg0fh853rz"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -2724,12 +2760,12 @@ final: prev: lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2021-08-05"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "2d2e57009a613c3c6cb7a2112d822ef91024cc38"; - sha256 = "066x2hkav2k83rjdnv3hmmm7fx4rrp4ab8704sc7p57q965kpwgc"; + rev = "0b1ec6fbb1fceebd88694e99fbc905d916c8b30a"; + sha256 = "19mwdnnvps3dr5125al5yqlbziirl100xz11jkp2rbk250pc5h8d"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -2760,12 +2796,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed-nvim"; - version = "2021-08-16"; + version = "2021-08-17"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "d1084c0ac413d6ad1ed3ec290604e7e2fbe0aae1"; - sha256 = "1qjs3wj4svjvbangivpvg7j4swm50d7s0ll1qsg61s59jchp1gjq"; + rev = "08f5bcfee90e2fe91e9c4cf2538ac17bc27c90af"; + sha256 = "0impdwlrd5jbcbmyk32r0dy0jwq3481l3ajryvbj7cqhjibm71nv"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2856,24 +2892,24 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-08-13"; + version = "2021-08-18"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "1c4a686e05ef30e4b815d1e3d77507f15efa7e99"; - sha256 = "04k78pijr15c21bdf05f4b3w0zmj3fd4572z4qmb3x9r993zznky"; + rev = "42b2c3b0767cf08616f0428eb57c254748a80d83"; + sha256 = "1p3dp9csj43bjgjfmv1aa3497ph2nmfdylinwqx15kgpgfhk2qxg"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; lspkind-nvim = buildVimPluginFrom2Nix { pname = "lspkind-nvim"; - version = "2021-08-15"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "onsails"; repo = "lspkind-nvim"; - rev = "6298b12a8cd833144997854d37eb6052aedc4bf4"; - sha256 = "169vksccl0qzc98pfn4wx2cihw0l8zl19qvfbs6rjxh9lcnbmijf"; + rev = "9cc326504e566f467407bae2669a98963c5404d2"; + sha256 = "0bbczy2hhdl79g749d41vv5fyfcdd3rsxhi8mbq6avc0vhw72m8c"; }; meta.homepage = "https://github.com/onsails/lspkind-nvim/"; }; @@ -2916,12 +2952,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-08-15"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "8cb1b905331463efd55b03de34a1ab519dcb5f04"; - sha256 = "1jn7p1lf0zxhbbnzsriznvlw20f97z0s51afhlj4cqihr1sv81z7"; + rev = "e3d057b2cc0d6ff7250ba1bb108d17e40b2904e8"; + sha256 = "02k612ib8974ra0221ldf8vrzk3na64g4w1z60mzy3i53qdjayh9"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3288,12 +3324,12 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2021-08-11"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "6cbf6f0610e3c194366fc938b4a0ad572ad476e9"; - sha256 = "03afyhpfbwisf4l025bj41qmfaa0awancrd4q8ikq8b07n61mzmv"; + rev = "344b753261fdd298c1b47ee59ac8268bd338e00f"; + sha256 = "0nmrjsylj46fdz96jidfg74y8yn55rkw9w41332zswm9h5mwp4av"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; @@ -3336,12 +3372,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-08-16"; + version = "2021-08-17"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "16de1b46e993e0b1e749c2345584c79ba14d11c1"; - sha256 = "0171v70ywnzpgzaadrw344511l3z7q60wvm6y5892z9m8mnwlw58"; + rev = "5cdf492b9844dcac4de7c3001bc1871decc6251f"; + sha256 = "0mzp2hifll0jkw1p7ycxlbysiqs2zrlka4x5s92xp050q33zj1il"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3528,12 +3564,12 @@ final: prev: nerdtree-git-plugin = buildVimPluginFrom2Nix { pname = "nerdtree-git-plugin"; - version = "2021-07-28"; + version = "2021-08-18"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "nerdtree-git-plugin"; - rev = "ff9b14f14dceecb6c08cb05053ad649c3b6ac250"; - sha256 = "1q2zjbg3j4j4746ljp2ccssgp2sykrn3zp4kyc9n0hlqaiwmhbm9"; + rev = "e1fe727127a813095854a5b063c15e955a77eafb"; + sha256 = "0d7xm5rafw5biv8phfyny2haqq50mnh0q4ms7dkhvp9k1k2k2whz"; }; meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/"; }; @@ -3648,12 +3684,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls-nvim"; - version = "2021-08-16"; + version = "2021-08-18"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "4db2c4e2b59d16143bd8903c9bc73776b535be50"; - sha256 = "18dg3gdfwxhhz8snvw697r4nmc9aag3ylrzm7g84k67hpfir82r6"; + rev = "f907d945d0285f42dc9ebffbc075ea725b93b6aa"; + sha256 = "1jg6wxknbzirq9j880yki8bm8v1zdkk60fyis67syf722vric9i8"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3768,12 +3804,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2021-08-16"; + version = "2021-08-17"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "29ad715924eb8fafa8cd042b1a9eb66b03db0d0d"; - sha256 = "0c8wy66743dwf04p3l3fphndr58g9crlg96x90xkx2kr2s64a9dd"; + rev = "f12fd73f11c979384ae82d2b1cd9332b5cf5f661"; + sha256 = "1qpk4a7r89431pad4afqxyxx1csi0h7wjgwh07fp4rfacr6k005m"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -3792,12 +3828,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-08-14"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "cfbcd727d97958943c0d94e8a8126abe27294ad3"; - sha256 = "0znfd451bshqczalw5w4gy2k7fp8630p7vkmfpp1n4gw7z3vchqg"; + rev = "253ec47cac406ff6e68020b6d18a05de323267d2"; + sha256 = "0ij5s82v7snk2iwy3w402dqxvbsb3207pv62h5fachpcdj7ybi9s"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3816,12 +3852,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-08-12"; + version = "2021-08-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "7e2906e9f68cce2cab7428af588006795afb40e1"; - sha256 = "0yk6l3bb2dqjrc37h8a7115ywmwaa5wvsijjvxx7psy2dlnv583r"; + rev = "46cb5996c8c71c7ce96afb6a4a034693c93f7424"; + sha256 = "1fc5ivv9lkfamvcr6dlqk9dwr5j3bs4x98k43sr213z4z0a6xa75"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -3888,12 +3924,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-08-13"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "1e53aeefa949f68214f6b86b4cc4375613d739ca"; - sha256 = "1x5w7j01gkyxz86d7rkwxi2mqh5z54cynrrk0pmjkmijshbxs6s8"; + rev = "5b31ffe949774218ab4bf4857a2d027b396d502d"; + sha256 = "0h5dwa52sgqg90jw044bic2akhvm4nd7ya9jf59yj8dhwcwjsk27"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3936,12 +3972,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-08-16"; + version = "2021-08-18"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "acb420880b83563c0ce83a3cea278cadfc7023e4"; - sha256 = "16bfn1qkbnicpkpisf5i4snra8glfg4rawvi52fpjqghxj9g1xz2"; + rev = "e2601bb4b8d125e3f96274fe57136004dce4c587"; + sha256 = "0yvz273qy2qf82f5yfkzh8zncwkg0hwkjy7b47f3bf65g5nwibzn"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4104,24 +4140,24 @@ final: prev: nvim-ts-context-commentstring = buildVimPluginFrom2Nix { pname = "nvim-ts-context-commentstring"; - version = "2021-07-06"; + version = "2021-08-17"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "a38c22022fe0ae8e8aae1ba9294a33b903eef409"; - sha256 = "0fqr68360fmfygirr65iapf9fp5ganvn69gw3p3k1blnx17jlzbk"; + rev = "72a3f45a294a4a871101f820c6b94a29bd9b203f"; + sha256 = "12cpak7b2aw2wrfx6gpw4lqx9c65q4fibsy5vf3a7h5g1i6yjg2m"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-08-01"; + version = "2021-08-17"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "94138b1ba193d81f130dbe9fc1f255f97b7697d5"; - sha256 = "1ha31j31yv8r46pl607s06xgjri7rp47w5zjf0k7qrg1cqgp9i5h"; + rev = "68afca45319e155e9b948163192182e6649562fb"; + sha256 = "1handw02d6wqsn3f8v549z0x4z7a481xcy2g3wsmxzlf2665l4fz"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -4392,12 +4428,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-08-13"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "0b78fe699b9049b8f46942664027b32102979832"; - sha256 = "16ghyvnsqdrfkjb7hawcvwrx56v6llnq4zziw4z1811j4n1v6ypa"; + rev = "15c3cb9e6311dc1a875eacb9fc8df69ca48d7402"; + sha256 = "0gdysws82vdcyfsfpkpg9wqw223vg6hh74pf821wxh8p6qg3r26m"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -4595,6 +4631,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/random.vim/"; }; + range-highlight-nvim = buildVimPluginFrom2Nix { + pname = "range-highlight-nvim"; + version = "2021-08-03"; + src = fetchFromGitHub { + owner = "winston0410"; + repo = "range-highlight.nvim"; + rev = "8b5e8ccb3460b2c3675f4639b9f54e64eaab36d9"; + sha256 = "1yswni0p1w7ja6cddxyd3m4hi8gsdyh8hm8rlk878b096maxkgw1"; + }; + meta.homepage = "https://github.com/winston0410/range-highlight.nvim/"; + }; + ranger-vim = buildVimPluginFrom2Nix { pname = "ranger-vim"; version = "2021-04-25"; @@ -4633,12 +4681,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring-nvim"; - version = "2021-08-16"; + version = "2021-08-18"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "aabd4776d3fd756b76f9e264496e1ea81cab77c4"; - sha256 = "168hpn3nxjsy3a5h3lvzk6gbhcfnh7k7p0xhpjxi67x1f99dnx0s"; + rev = "ab4c6b0fb37bcadbc55ae02c9638bbc424dc8842"; + sha256 = "0j54rv7gq31m8g0jwb6smvipgcd9pizry39vqx97wfbikcsw3zab"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -5091,12 +5139,12 @@ final: prev: sql-nvim = buildVimPluginFrom2Nix { pname = "sql-nvim"; - version = "2021-08-16"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "tami5"; repo = "sql.nvim"; - rev = "cc7b7cc76427eb321955278587b84e84c0af246e"; - sha256 = "0i2j3s6n9zmpn8jc5waxl3biqca23f5cbiapgr9gwgqj22f1xzd2"; + rev = "2feef57bef147cf502b4491e3fc6c58a05f3096e"; + sha256 = "0zyjbhhn33nbz7cf9vhr94gn38pvr5hd9d31sirdwqy49shvwlc1"; }; meta.homepage = "https://github.com/tami5/sql.nvim/"; }; @@ -5199,12 +5247,12 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline-nvim"; - version = "2021-08-01"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "cc3334e140dd3c21246fbd58233db5f01856ed56"; - sha256 = "0z1kfkfwl9fx9a4imh9xyjxnip83yh98an22c3nghmvick5ssryi"; + rev = "2047f401e7a9f0024cc48f7bbe8cc73bc199f883"; + sha256 = "0d5bcg4l4vfsr0pydcslj574ib6qxqsnhgi6k61p4wa4v1c6aif2"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -5282,6 +5330,18 @@ final: prev: meta.homepage = "https://github.com/godlygeek/tabular/"; }; + tagalong-vim = buildVimPluginFrom2Nix { + pname = "tagalong-vim"; + version = "2021-06-28"; + src = fetchFromGitHub { + owner = "AndrewRadev"; + repo = "tagalong.vim"; + rev = "e04ed6f46da5b55450a52e7de1025f1486d55839"; + sha256 = "0bcmli82a58zvyqpacz5zyz9k9q8x39rcci095lz6ab6vnwhbl47"; + }; + meta.homepage = "https://github.com/AndrewRadev/tagalong.vim/"; + }; + tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; version = "2021-08-06"; @@ -5403,6 +5463,18 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-fzy-native.nvim/"; }; + telescope-project-nvim = buildVimPluginFrom2Nix { + pname = "telescope-project-nvim"; + version = "2021-08-03"; + src = fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope-project.nvim"; + rev = "6f63c15efc4994e54c3240db8ed4089c926083d8"; + sha256 = "0mda6cak1qqa5h9j5xng8wq81aqfypizmxpfdfqhzjsswwpa9bjy"; + }; + meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; + }; + telescope-symbols-nvim = buildVimPluginFrom2Nix { pname = "telescope-symbols-nvim"; version = "2021-08-07"; @@ -5429,12 +5501,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-08-13"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "f1a27baf279976845eb43c65e99a71d7f0f92d02"; - sha256 = "069r1pkg82zj7fm55gk21va2f2x2jmrknfwld5bp0py344gh65n1"; + rev = "d6d28dbe324de9826a579155076873888169ba0f"; + sha256 = "0gxp54b5p1hbaigm7xq0c7dcnq1dbncp80fl8nrmwax34r6rv4d1"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6642,12 +6714,12 @@ final: prev: vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2021-08-12"; + version = "2021-08-17"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "0291f0ddfd6d34f5d3dfc272e69408510b53df62"; - sha256 = "0c8vzwkf38ldi18g5443wj6v7cgb009cbf6w13qashr6cqazbpga"; + rev = "c17487d0dfafb204fb43c60dc58a4ea5c4728fe6"; + sha256 = "1xba1lbx1dkfq150pzip7q70zzk2fkbx123yp8z9b0jzbwwa17rf"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -7086,16 +7158,28 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-08-14"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "f3e92c7721505a59738db15e3e80bc5ccff08e36"; - sha256 = "1ciwpk1gxjiay6c304bn2qw1f2cpsy751606l0m2inlscam2pal1"; + rev = "81f293852ec195727a657c7d247af5cc3f705c45"; + sha256 = "0a5411vcmgssb9j7mpr43zpi2hjnp4md8fvjxjkhx6in69pvyh91"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; + vim-gh-line = buildVimPluginFrom2Nix { + pname = "vim-gh-line"; + version = "2021-03-25"; + src = fetchFromGitHub { + owner = "ruanyl"; + repo = "vim-gh-line"; + rev = "4ca32f57f5f95cd3436c3f9ee7657a9b9c0ca763"; + sha256 = "0pfw8jvmxwhdvjcfypiqk2jlk5plqbigjmykbqs1zvaznc2b7z5v"; + }; + meta.homepage = "https://github.com/ruanyl/vim-gh-line/"; + }; + vim-ghost = buildVimPluginFrom2Nix { pname = "vim-ghost"; version = "2020-06-19"; @@ -7206,12 +7290,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-08-09"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "b8a824ae865032066793fb10c1c7d8a184a3a035"; - sha256 = "02dbmkr48cac0qbiqcgd1qblbj98a9pakmsr5kr54wa89s90bpxm"; + rev = "c34c73a4269857e694cda38431601ab753fcbc3f"; + sha256 = "0dzkvb55qyqrvw0cr2kjdhsxnl1zhd0jnday0lagqrw1kvvnz3xv"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -7736,12 +7820,12 @@ final: prev: vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2021-08-14"; + version = "2021-08-17"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "5d6f5347346291b18e4a1ce769ad6f9cb2c46ba0"; - sha256 = "0cv2ppfc847r507v4jrx4z08krgy82i2bkjcqbdmf9k1qmgim00w"; + rev = "a58f56960933df0b34b98ba3b025995774315adc"; + sha256 = "16vz20fvhbb2p9g68qix9s4fbr9adrgwc45g12ldi7bdgkr1006g"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -8373,12 +8457,12 @@ final: prev: vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2021-08-16"; + version = "2021-08-17"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "bc49a0c2b5ded3f13445e47aa3cf8d3a0f972926"; - sha256 = "0l5gaf94p91xck6wn3a55dybd1d820dpq31v3sy3i2bxwfw0g8zd"; + rev = "9c84cb3eeff0a30f5f8f0dccd77b12ac8494dd95"; + sha256 = "17fjjm5mcwvi0mxsfnqasbr96cln2b0125wyzjj36z4y2bx7w1dm"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -8865,12 +8949,12 @@ final: prev: vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2021-07-22"; + version = "2021-08-18"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "5516e301a5c3cacac008342006a712f5fa80f6a1"; - sha256 = "0fwy02mj0gafgv01qpgfyi5n0i0lrfzy8nw93hrpqwc97pckh1pp"; + rev = "cb2ed789ebcd836fa699fc4555f924f69d19f199"; + sha256 = "1a4h0cc4w68mfpkw37vxnaqk9ml3ygkgmfqqdcr74ncmnl58cqjq"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -8901,12 +8985,12 @@ final: prev: vim-sayonara = buildVimPluginFrom2Nix { pname = "vim-sayonara"; - version = "2017-03-13"; + version = "2021-08-12"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-sayonara"; - rev = "357135ce127581fab2c0caf45d4b3fec4603aa77"; - sha256 = "0m4pbpqq7m4rbqj1sxzx3r25znm9m5df6z6kndc6x5c1p27a63pi"; + rev = "7e774f58c5865d9c10d40396850b35ab95af17c5"; + sha256 = "0m22zjby54gvpg0s7qbpxdvjx6bcf3xdb58yc90bmf6pxklllc20"; }; meta.homepage = "https://github.com/mhinz/vim-sayonara/"; }; @@ -9141,12 +9225,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-08-09"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "75309fc96c49725cf9bbd7bc881b7b342a60aa9a"; - sha256 = "1k5n73dz60ds9ahgrkiypk0srh1ys39ahipsxkmm2k94gzmh6hj7"; + rev = "9e5219ae92f9b1b2ee23aff067618a6008a74fa5"; + sha256 = "1zv17p6ri0xs5qypva45afvwigw1hpkx06zf6ngk00nmi1vqd4cb"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -9550,12 +9634,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2021-08-14"; + version = "2021-08-18"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "2f43d6da23b880375ba53cf55d33b0bc021f6aec"; - sha256 = "1gz8dsjqvyma147qmqgbm512rka8wmfhgvxnlz48mh5i8l2i8ypg"; + rev = "a69dbbcccdc31fddbffd63d4db00d08daec1fff8"; + sha256 = "1pn4582qlivipy07nqyg2kigjscsprjx2vdal21jqxwrf49gh1fa"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -9610,12 +9694,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2021-08-15"; + version = "2021-08-18"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "64545fecb865f8cbe7160a5d7d1b8367cea1656c"; - sha256 = "1m8g6j2086x3fq99158m4g2wcsp8v1s00wim0hka7zhfwz0pd7zp"; + rev = "416c58d00280c452f4c8c75866393394031fcb6b"; + sha256 = "0vm91shvwzq6x3llxjrprx2vimk73hkcdcmivbpkmvbsx0z33480"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -10043,12 +10127,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-08-16"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "cb71390373e793875efd3609e0ad800d816ff4af"; - sha256 = "0l9yklk0pd7kgy39b09rirwpqbryy148ch9vffq3isyhdk6b3v10"; + rev = "5b8c24681831bd816b0e70c0b6b597c2c3945755"; + sha256 = "1f9ih0r9vqazrspd0h8jvrv3m66akd0aj9misgkh7fh3mnvmwzri"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -10089,6 +10173,18 @@ final: prev: meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; + vis = buildVimPluginFrom2Nix { + pname = "vis"; + version = "2013-04-26"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "vis"; + rev = "6a87efbfbd97238716b602c2b53564aa6329b5de"; + sha256 = "1bg1d2gmln1s0324c4a2338qx729yy708f1hgk98fkgl9sk2bhdi"; + }; + meta.homepage = "https://github.com/vim-scripts/vis/"; + }; + vissort-vim = buildVimPluginFrom2Nix { pname = "vissort-vim"; version = "2014-01-31"; @@ -10163,12 +10259,12 @@ final: prev: wilder-nvim = buildVimPluginFrom2Nix { pname = "wilder-nvim"; - version = "2021-08-16"; + version = "2021-08-17"; src = fetchFromGitHub { owner = "gelguy"; repo = "wilder.nvim"; - rev = "f70f292f9e680b3645c8e24ebee524264a9e75e2"; - sha256 = "1a45s282b85hjffdzd2375wv6c70dlli7l0wpcsq56ab4pyxamqz"; + rev = "3b1844d9d69972bec131aa66562afa545b00c883"; + sha256 = "1lr5vp2rr3i18qjv2h83d0bzrlc0617acwsimyd5jb105qa8rs09"; }; 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 5b6b9a2264..f26258de3b 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -461,6 +461,10 @@ self: super: { configurePhase = "cd vim"; }); + range-highlight-nvim = super.range-highlight-nvim.overrideAttrs (old: { + dependencies = with self; [ cmd-parser-nvim ]; + }); + refactoring-nvim = super.refactoring-nvim.overrideAttrs (old: { dependencies = with self; [ nvim-treesitter plenary-nvim ]; }); @@ -830,7 +834,7 @@ self: super: { }); vim-xdebug = super.vim-xdebug.overrideAttrs (old: { - postInstall = false; + postInstall = null; }); vim-xkbswitch = super.vim-xkbswitch.overrideAttrs (old: { 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 39973d77e0..7e0f2580cf 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -20,6 +20,7 @@ andrep/vimacs andreshazard/vim-logreview AndrewRadev/sideways.vim@main AndrewRadev/splitjoin.vim@main +AndrewRadev/tagalong.vim andsild/peskcolor.vim andviro/flake8-vim andweeb/presence.nvim@main @@ -35,6 +36,7 @@ artur-shaik/vim-javacomplete2 autozimu/LanguageClient-neovim axelf4/vim-strip-trailing-whitespace ayu-theme/ayu-vim +b3nj5m1n/kommentary@main bakpakin/fennel.vim bazelbuild/vim-bazel bbchung/clighter8 @@ -127,6 +129,8 @@ ehamberg/vim-cute-python eigenfoo/stan-vim eikenb/acp elixir-editors/vim-elixir +ellisonleao/glow.nvim@main +ellisonleao/gruvbox.nvim@main elmcast/elm-vim elzr/vim-json embark-theme/vim@main as embark-vim @@ -217,6 +221,7 @@ hrsh7th/cmp-buffer@main hrsh7th/cmp-calc@main hrsh7th/cmp-emoji@main hrsh7th/cmp-nvim-lsp@main +hrsh7th/cmp-nvim-lua@main hrsh7th/cmp-path@main hrsh7th/cmp-vsnip@main hrsh7th/nvim-cmp@main @@ -427,7 +432,7 @@ mhartington/oceanic-next mhinz/vim-crates mhinz/vim-grepper mhinz/vim-janah -mhinz/vim-sayonara +mhinz/vim-sayonara@7e774f58c5865d9c10d40396850b35ab95af17c5 mhinz/vim-signify mhinz/vim-startify michaeljsmith/vim-indent-object @@ -491,8 +496,6 @@ noc7c9/vim-iced-coffee-script norcalli/nvim-colorizer.lua norcalli/nvim-terminal.lua norcalli/snippets.nvim -npxbr/glow.nvim@main -npxbr/gruvbox.nvim@main ntpeters/vim-better-whitespace numirias/semshi nvie/vim-flake8 @@ -507,6 +510,7 @@ nvim-telescope/telescope-frecency.nvim nvim-telescope/telescope-fzf-native.nvim@main nvim-telescope/telescope-fzf-writer.nvim nvim-telescope/telescope-fzy-native.nvim +nvim-telescope/telescope-project.nvim nvim-telescope/telescope-symbols.nvim nvim-telescope/telescope-z.nvim@main nvim-telescope/telescope.nvim @@ -610,6 +614,7 @@ RRethy/nvim-base16 RRethy/vim-hexokinase RRethy/vim-illuminate rstacruz/vim-closer +ruanyl/vim-gh-line ruifm/gitlinker.nvim rust-lang/rust.vim ryanoasis/vim-devicons @@ -811,6 +816,7 @@ vim-scripts/ShowMultiBase vim-scripts/tabmerge vim-scripts/taglist.vim vim-scripts/utl.vim +vim-scripts/vis vim-scripts/wombat256.vim vim-scripts/YankRing.vim vim-syntastic/syntastic @@ -840,6 +846,8 @@ will133/vim-dirdiff wincent/command-t wincent/ferret windwp/nvim-autopairs +winston0410/cmd-parser.nvim +winston0410/range-highlight.nvim wlangstroth/vim-racket wsdjeg/vim-fetch xavierd/clang_complete diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 4293f53e47..1ae8ed3ec7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "firmware-linux-nonfree"; - version = "2021-07-16"; + version = "2021-08-18"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = "refs/tags/" + lib.replaceStrings ["-"] [""] version; - sha256 = "185pnaqf2qmhbcdvvldmbar09zgaxhh3h8x9bxn6079bcdpaskn6"; + rev = "refs/tags/" + lib.replaceStrings [ "-" ] [ "" ] version; + sha256 = "sha256-RLPTbH2quBqCF3fi70GtOE0i3lEdaL5xo67xk8gbYMo="; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0g470hj2ylpviijfpjqzsndn2k8kkscj27wqwk51xlk8cr3mrahb"; + outputHash = "sha256-0ZNgRGImh6sqln7bNP0a0lbSPEp7GwVoIuuOxW2Y9OM="; meta = with lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix new file mode 100644 index 0000000000..2103012d3e --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, lib}: + +stdenv.mkDerivation rec { + pname = "libreelec-dvb-firmware"; + version = "1.4.2"; + + src = fetchFromGitHub { + repo = "dvb-firmware"; + owner = "LibreElec"; + rev = version; + sha256 = "1xnfl4gp6d81gpdp86v5xgcqiqz2nf1i43sb3a4i5jqs8kxcap2k"; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp -rv firmware $out/lib + find $out/lib \( -name 'README.*' -or -name 'LICEN[SC]E.*' -or -name '*.txt' \) | xargs rm + + runHook postInstall + ''; + + meta = with lib; { + description = "DVB firmware from LibreELEC"; + homepage = "https://github.com/LibreELEC/dvb-firmware"; + license = licenses.unfreeRedistributableFirmware; + maintainers = with maintainers; [ kittywitch ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix deleted file mode 100644 index 4ef9370c84..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "openelec-dvb-firmware"; - version = "0.0.51"; - - src = fetchurl { - url = "https://github.com/OpenELEC/dvb-firmware/archive/${version}.tar.gz"; - sha256 = "cef3ce537d213e020af794cecf9de207e2882c375ceda39102eb6fa2580bad8d"; - }; - - installPhase = '' - runHook preInstall - - DESTDIR="$out" ./install - find $out \( -name 'README.*' -or -name 'LICEN[SC]E.*' -or -name '*.txt' \) | xargs rm - - runHook postInstall - ''; - - meta = with lib; { - description = "DVB firmware from OpenELEC"; - homepage = "https://github.com/OpenELEC/dvb-firmware"; - license = licenses.unfreeRedistributableFirmware; - platforms = platforms.linux; - priority = 7; - }; -} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix index ca750d89cc..a7bc361069 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-firmware"; # Check Makefile when updating, make sure postInstall matches make install - version = "1.0.24"; + version = "1.0.28"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; rev = version; - sha256 = "sha256-Poe18HKEQusvN3WF4ZAV1WCvU8/3HKpHEqDsfDO62V0="; + sha256 = "sha256-hv8Vdpg/Tt3eo2AdFlOEG182jH5Oy7/BX3p1EMPQjnc="; }; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--workspace" ]; - cargoSha256 = "sha256-gGw3zpxLxQZ3rglpDERO0fSxBOez1Q10Fljis6nyB/4="; + cargoSha256 = "sha256-A39zvxvZB3j59giPAVeucHPzqwofnugmLweiPXh5Uzg="; # Purposefully don't install systemd unit file, that's for NixOS postInstall = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iptables/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iptables/default.nix index 912d9078c9..fe0e82c4a8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iptables/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iptables/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - postInstall = optional nftablesCompat '' + postInstall = optionalString nftablesCompat '' rm $out/sbin/{iptables,iptables-restore,iptables-save,ip6tables,ip6tables-restore,ip6tables-save} ln -sv xtables-nft-multi $out/bin/iptables ln -sv xtables-nft-multi $out/bin/iptables-restore diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index 2a23c8d3ea..c82f872e48 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -790,6 +790,7 @@ let MODVERSIONS = whenOlder "4.9" yes; MOUSE_ELAN_I2C_SMBUS = yes; MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension + MOUSE_PS2_VMMOUSE = yes; MTRR_SANITIZER = yes; NET_FC = yes; # Fibre Channel driver support # GPIO on Intel Bay Trail, for some Chromebook internal eMMC disks diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index ce0bb98ad6..6f72d35fcf 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.243"; + version = "4.14.244"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "0wdk93qv91pa6bd3ff1gv7manhkzh190c5blcpl14cbh9m2ms8vz"; + sha256 = "0x554dck5f78ljknwahjvf49952s1w0zja3yh4vfz6lmf6hvzq5n"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index 3d1beb7bd6..62de063c29 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.202"; + version = "4.19.204"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "09ya7n0il8fipp8ksb8cyl894ihny2r75g70vbhclbv20q2pv0pj"; + sha256 = "1rcx99sz4fgr2d138i92dw2vfplnqgys58hxywgmjb56c83l3qy4"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index 8e3108a9d2..292691fea2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.57"; + version = "5.10.60"; # 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 = "0b8lwfjlyd6j0csk71v07bxb5lrrzp545g1wv6kdk0kzq6maxfq0"; + sha256 = "13gpamqj0shvad4nd9v11iv8qdfbjgb242nbvcim2z3c7xszfvv9"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; 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 87be091cd4..dbbd4a9e87 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.11"; + version = "5.13.12"; # 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 = "0za59652wrh4mlhd9w3dx4y1nnk8nrj9hb56pssgdckdvp7rp4l0"; + sha256 = "0948w1zc2gqnl8x60chjqngfzdi0kcxm12i1nx3nx4ksiwj5vc98"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index 1433c5925a..7cf9473451 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.139"; + version = "5.4.142"; # 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 = "0zx3hj8fc0qpdmkn56cna5438wjxmj42a69msbkxlg4mnz6d0w84"; + sha256 = "0l8l4cg04p5vx890jm45r35js1v0nljd0lp5qwkvlr45jql5fy4r"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix index 854218f74d..0e123e8941 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18210"; - sha256 = "1vp3d44ha68hhhk13g86j9lk0isfwqfkk1rbm0gihzjjzvpkxbab"; + rev = "18239"; + sha256 = "1nzxkc53jmsyaxnl5q9hmgrfd3c8sn2y0pcv7ng042bnvr8hhh82"; } , ... }: diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 88bc386f59..b71748b75a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.56-rt48"; # updated by ./update-rt.sh + version = "5.10.56-rt49"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -25,7 +25,7 @@ in buildLinux (args // { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1fi83iky7r80cc1xlxyvsd2fcfgd67hz1nhmrhxawzkx6cx6i55a"; + sha256 = "17r7d8xj5nph1j1fyjra887mqjlf6is9pgpw0jyhd46z1jy2bw3v"; }; }; 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 61b17260f7..ef406ab90c 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.11"; + version = "5.13.12"; release = "1"; suffix = "xanmod${release}-cacule"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-55BRj0JNQKwmSvlquNHr6ZaI7x/sBYzfZPHIblxK4lY="; + sha256 = "sha256-cuZ8o0Ogi2dg4kVoFv4aqThRPDVI271i+DVw5Z4R7Kg="; }; structuredExtraConfig = with lib.kernel; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix index 712f3f0889..70a9ecc602 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,20 +1,25 @@ { lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.13.9"; - suffix = "zen1"; + # having the full version string here makes it easier to update + modDirVersion = "5.13.10-zen1"; + parts = lib.splitString "-" modDirVersion; + version = lib.elemAt parts 0; + suffix = lib.elemAt parts 1; + + numbers = lib.splitString "." version; + branch = "${lib.elemAt numbers 0}.${lib.elemAt numbers 1}"; in buildLinux (args // { - modDirVersion = "${version}-${suffix}"; - inherit version; + inherit version modDirVersion; isZen = true; src = fetchFromGitHub { owner = "zen-kernel"; repo = "zen-kernel"; - rev = "v${version}-${suffix}"; - sha256 = "sha256-RuY6ZIIKU56R+IGMtQDV6mIubGDqonRpsIdlrpAHFXM="; + rev = "v${modDirVersion}"; + sha256 = "sha256-0QNRWKB7tAWZR3wuKJf+es6WqjScSKnDrMwH74o2oOA="; }; structuredExtraConfig = with lib.kernel; { @@ -22,7 +27,7 @@ buildLinux (args // { }; extraMeta = { - branch = "5.13"; + inherit branch; maintainers = with lib.maintainers; [ atemu andresilva ]; description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads."; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/update-zen.sh b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/update-zen.sh new file mode 100755 index 0000000000..1532d7be02 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/update-zen.sh @@ -0,0 +1,21 @@ +#! /usr/bin/env nix-shell +#! nix-shell -I nixpkgs=../../../.. -i bash -p nix-prefetch git gnused gnugrep nix curl +set -euo pipefail -x + +nixpkgs="$(git rev-parse --show-toplevel)" +old=$(nix-instantiate --eval -A linuxPackages_zen.kernel.modDirVersion "$nixpkgs") +old="${old%\"}" +old="${old#\"}" +new=$(curl https://github.com/zen-kernel/zen-kernel/releases.atom | grep -m1 -o -E '[0-9.]+-zen[0-9]+') +if [[ "$new" == "$old" ]]; then + echo "already up-to-date" + exit 0 +fi + +path="$nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix" + +sed -i -e "s!modDirVersion = \".*\"!modDirVersion = \"${new}\"!" "$path" +checksum=$(nix-prefetch "(import ${nixpkgs} {}).linuxPackages_zen.kernel") +sed -i -e "s!sha256 = \".*\"!sha256 = \"${checksum}\"!" "$path" + +git commit -m "linux_zen: ${old} -> ${new}" $path diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix index d822ceed71..2e52e49639 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix @@ -4,7 +4,7 @@ , pkg-config , util-linux , libuuid -, thin-provisioning-tools, libaio +, libaio , enableCmdlib ? false , enableDmeventd ? false , udev ? null @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ udev libuuid thin-provisioning-tools libaio ]; + buildInputs = [ udev libuuid libaio ]; configureFlags = [ "--disable-readline" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix index ae175a3632..f19c7ea7a4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix @@ -82,6 +82,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; dontDisableStatic = true; + dontAddStaticConfigureFlags = true; separateDebugInfo = true; NIX_DONT_SET_RPATH = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nftables/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nftables/default.nix index f5fdee14c1..e0e69adb4b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nftables/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nftables/default.nix @@ -10,12 +10,12 @@ with lib; stdenv.mkDerivation rec { - version = "0.9.9"; + version = "1.0.0"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2"; - sha256 = "1d7iwc8xlyfsbgn6qx1sdfcq7jhpl8wpfj39hcd06y8dzp3jvvvn"; + sha256 = "1x25zs2czmn14mmq1nqi4zibsvh04vqjbx5lxj42nylnmxym9gsq"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index b0363fa7a7..b58c3b60bf 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -26,7 +26,7 @@ rollback= upgrade= upgrade_all= profile=/nix/var/nix/profiles/system -buildHost= +buildHost=localhost targetHost= maybeSudo=() diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/restool/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/restool/default.nix new file mode 100644 index 0000000000..4f488c2832 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/restool/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, fetchgit, bash, coreutils, dtc, file, gawk, gnugrep, gnused }: + +stdenv.mkDerivation rec { + pname = "restool"; + version = "20.12"; + + src = fetchgit { + url = "https://source.codeaurora.org/external/qoriq/qoriq-components/restool"; + rev = "LSDK-${version}"; + sha256 = "137xvvms3n4wwb5v2sv70vsib52s3s314306qa0mqpgxf9fb19zl"; + }; + + nativeBuildInputs = [ file ]; + buildInputs = [ bash coreutils dtc gawk gnugrep gnused ]; + + makeFlags = [ + "prefix=$(out)" + "VERSION=${version}" + ]; + + preFixup = '' + # wrapProgram interacts badly with the ls-main tool, which relies on the + # shell's $0 argument to figure out which operation to run (busybox-style + # symlinks). Instead, inject the environment directly into the shell + # scripts we need to wrap. + for tool in ls-append-dpl ls-debug ls-main; do + sed -i "1 a export PATH=\"$out/bin:${lib.makeBinPath buildInputs}:\$PATH\"" $out/bin/$tool + done + ''; + + meta = with lib; { + description = "DPAA2 Resource Management Tool"; + longDescription = '' + restool is a user space application providing the ability to dynamically + create and manage DPAA2 containers and objects from Linux. + ''; + homepage = "https://source.codeaurora.org/external/qoriq/qoriq-components/restool/about/"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ delroth ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tuigreet/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/tuigreet/default.nix index 89dfe85c08..5911305c0d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/tuigreet/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/tuigreet/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "tuigreet"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "apognu"; repo = pname; rev = version; - sha256 = "sha256-Ip/GhpHgTgWFyCdujcCni1CLFDDirUbJuzCj8QiUsFc="; + sha256 = "sha256-Exw3HPNFh1yiUfDfaIDiz2PemnVLRmefD4ydgMiHQAc="; }; - cargoSha256 = "sha256-G/E/2wjeSY57bQJgrZYUA1sWUwtk5mRavmLwy1EgHRM="; + cargoSha256 = "sha256-/JNGyAEZlb4YilsoXtaXekXNVev6sdVxS4pEcPFh7Bg="; meta = with lib; { description = "Graphical console greter for greetd"; 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 9ff6d03fda..c1aa7be2af 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ fortuneteller2k ]; platforms = platforms.linux; + outputsToInstall = [ "out" ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/default.nix index f1ae206923..f34e106727 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "wooting-udev-rules"; - version = "20190601"; + version = "20210525"; # Source: https://wooting.helpscoutdocs.com/article/68-wootility-configuring-device-access-for-wootility-under-linux-udev-rules src = [ ./wooting.rules ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules b/third_party/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules index d906df3d4c..fa4148d874 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules @@ -7,3 +7,8 @@ SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", MODE:="0 SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", MODE:="0660", GROUP="input" # Wooting Two update mode SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", MODE:="0660", GROUP="input" + +# Wooting Two Lekker Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1210", MODE:="0660", GROUP="input" +# Wooting Two Lekker Edition update mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="121f", MODE:="0660", GROUP="input" diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix index 60fed65e6d..9e7e6c249e 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix @@ -17,11 +17,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.4.0"; + version = "5.4.1"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e"; + sha256 = "fb8b962dd9ef744e2551c4f052454bc2a30e39c1f662f4f3522e8f221d8e3d66"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix b/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix index cd7c1a07d2..015802ac31 100644 --- a/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bftpd"; - version = "5.9"; + version = "6.0"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-LMcjPdePlKqVD3kdlPxF4LlVp9BLJFkgTg+WWaWPrqY="; + sha256 = "sha256-t+YCys67drYKcD3GXxSVzZo4HTRZArIpA6EofeyPAlw="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix b/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix index 2a97d817d9..f4ea4be006 100644 --- a/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix +++ b/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "heisenbridge"; - version = "0.99.8"; + version = "1.0.0"; src = fetchFromGitHub { owner = "hifi"; repo = "heisenbridge"; rev = "v${version}"; - sha256 = "sha256-NUSAOixU93z77QeVAua6yNk+/eDRreS5Hv1btBWh3gs="; + sha256 = "sha256-DmYGP50GsthxvhXUMkwV+mvcfCjCMu90VMe5woNvf1w="; }; propagatedBuildInputs = with python3Packages; [ 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 bef068f085..6d91d5fa72 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.7"; + version = "2021.8.8"; 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 a3a2b07c14..7dd6edf17d 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -134,7 +134,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.8.7"; + hassVersion = "2021.8.8"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -151,7 +151,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0f69jcpxyr0kzziwl6bfj2jbn23hrj1796ml6jsk9mnpfkdsd9vi"; + sha256 = "1fj16qva04d9qhpnfxxacsp82vqqfha5c2zg4f850kld4qhwrgky"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/third_party/nixpkgs/pkgs/servers/klipper/default.nix b/third_party/nixpkgs/pkgs/servers/klipper/default.nix index f120454ac8..aa933b0fb6 100644 --- a/third_party/nixpkgs/pkgs/servers/klipper/default.nix +++ b/third_party/nixpkgs/pkgs/servers/klipper/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; # We have no LTO on i686 since commit 22284b0 - postPatch = lib.optional stdenv.isi686 '' + postPatch = lib.optionalString stdenv.isi686 '' substituteInPlace chelper/__init__.py \ --replace "-flto -fwhole-program " "" ''; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index ab92c29ee3..7b5779b958 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -20,6 +20,7 @@ ourNodePackages."${packageName}".override { ''; passthru.tests.matrix-appservice-irc = nixosTests.matrix-appservice-irc; + passthru.updateScript = ./update.sh; meta = with lib; { description = "Node.js IRC bridge for Matrix"; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh new file mode 100755 index 0000000000..f6cf0c0297 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix nodejs-12_x curl jq + +set -euo pipefail +# cd to the folder containing this script +cd "$(dirname "$0")" + +CURRENT_VERSION=$(nix eval --raw '(with import ../../../../. {}; matrix-appservice-irc.version)') +TARGET_VERSION="$(curl https://api.github.com/repos/matrix-org/matrix-appservice-irc/releases/latest | jq -r ".tag_name")" + +if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then + echo "matrix-appservice-irc is up-to-date: ${CURRENT_VERSION}" + exit 0 +fi + +echo "matrix-appservice-irc: $CURRENT_VERSION -> $TARGET_VERSION" + +sed -i "s/#$CURRENT_VERSION/#$TARGET_VERSION/" package.json + +./generate-dependencies.sh + +# Apparently this is done by r-ryantm, so only uncomment for manual usage +#git add ./package.json ./node-packages.nix +#git commit -m "matrix-appservice-irc: ${CURRENT_VERSION} -> ${TARGET_VERSION}" diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix index 9764e4ab3e..fd26dfd3fc 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix @@ -23,14 +23,14 @@ let in python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; - version = "unstable-2021-08-12"; + version = "0.10.1"; disabled = python.pythonOlder "3.7"; src = fetchFromGitHub { owner = "tulir"; repo = pname; - rev = "ec64c83cb01791525a39f937f3b847368021dce8"; - sha256 = "0rg4f4abdddhhf1xpz74y4468dv3mnm7k8nj161r1xszrk9f2n76"; + rev = "v${version}"; + sha256 = "sha256-1Dmc7WRlT2ivGkdrGDC1b44DE0ovQKfUR0gDiQE4h5c="; }; patches = [ ./0001-Re-add-entrypoint.patch ./0002-Don-t-depend-on-pytest-runner.patch ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-bot/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-bot/default.nix index 9fb364de19..2d36dcb8e1 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-bot/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-bot/default.nix @@ -17,11 +17,9 @@ buildGoModule rec { sed "s;/templates/default.tmpl;$out/share&;" -i cmd/alertmanager-bot/main.go ''; - preBuild = '' - export buildFlagsArray=( - "-ldflags=-s -w -X main.Version=v${version} -X main.Revision=${src.rev}" - ) - ''; + ldflags = [ + "-s" "-w" "-X main.Version=v${version}" "-X main.Revision=${src.rev}" + ]; postInstall = '' install -Dm644 -t $out/share/templates $src/default.tmpl diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 5648ea0129..56f8b30fbb 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "8.1.1"; + version = "8.1.2"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-dP0aBlp/956YyRGkIJTR9UtGBMTsSUBt9LYB5yIJvDU="; + sha256 = "sha256-xlERuPkhPEHbfX7bVoc9CjqYe/P0Miiyu5c067LLS1M="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-kJHZmP+os+qmpdK2bm5FY7rdT0yyXrDYACn+U4xyUr8="; + sha256 = "sha256-0fzCwkVHrBFiSKxvyTK0Xu8wHpyo58u+a9c7daaUCc0="; }; - vendorSha256 = "sha256-cfErlr7YS+8TVy0+XWDiA3h1lMoV3efdsjuH+yEcwXs="; + vendorSha256 = "sha256-DFD6orsM5oDOLgHbCbrD+zNKVGbQT3Izm1VtNCZO40I="; preBuild = '' # The testcase makes an API call against grafana.com: diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter-deps.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter-deps.nix deleted file mode 100644 index 2d94ffeba2..0000000000 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter-deps.nix +++ /dev/null @@ -1,93 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/123Haynes/go-http-digest-auth-client"; - fetch = { - type = "git"; - url = "https://github.com/123Haynes/go-http-digest-auth-client"; - rev = "4c2ff1556cab0c8c14069d8d116c34db59c50c54"; - sha256 = "0hpynnvwlxcdrrplvzibqk3179lzwkv8zlp03r6cd1vsd28b11ja"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4b2b341e8d7715fae06375aa633dbb6e91b3fb46"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "e91709a02e0e8ff8b86b7aa913fdc9ae9498e825"; - sha256 = "16arbb7nwvs7lkpr7i9vrv8mk9h77zd3blzp3z9b0infqla4ddzc"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c182affec369e30f25d3eb8cd8a478dee585ae7d"; - sha256 = "1xqsf9vpcrd4hp95rl6kgmjvkv1df4aicfw4l5vfcxcwxknfx2xs"; - }; - } - { - goPackagePath = "github.com/mxschmitt/golang-env-struct"; - fetch = { - type = "git"; - url = "https://github.com/mxschmitt/golang-env-struct"; - rev = "0c54aeca83972d1c7adf812b37dc53a6cbf58fb7"; - sha256 = "19h840xhkglxwfbwx6w1qyndzg775b14kpz3xpq0lfrkfxdq0w9l"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7"; - sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "3f6cbd95606771ac9f7b1c9247d2ca186cb72cb9"; - sha256 = "1d9qc9jwqsgh6r5x5qkf6c6pkfb5jfhxls431ilhawn05fbyyypq"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fd36f4220a901265f90734c3183c5f0c91daa0b8"; - sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "c873fb1f9420b83ee703b4361c61183b4619f74d"; - sha256 = "1fmigir3c35nxmsj4bqwfp69kaxy415qk0ssi4wplcyd1g656lbg"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "87a4384529e0652f5035fb5cc8095faf73ea9b0b"; - sha256 = "1rjd7hf5nvsdw2jpqpapfw6nv3w3zphfhkrh5p7nryakal6kcgmh"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index cefa457906..bd8f667b11 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -1,28 +1,27 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "fritzbox-exporter"; - version = "v1.0-32-g90fc0c5"; - rev = "90fc0c572d3340803f7c2aafc4b097db7af1f871"; + version = "unstable-2021-04-13"; src = fetchFromGitHub { - inherit rev; + rev = "fd36539bd7db191b3734e17934b5f1e78e4e9829"; owner = "mxschmitt"; repo = "fritzbox_exporter"; - sha256 = "08gcc60g187x1d14vh7n7s52zkqgj3fvg5v84i6dw55rmb6zzxri"; + sha256 = "0w9gdcnfc61q6mzm95i7kphsf1rngn8rb6kz1b6knrh5d8w61p1n"; }; - goPackagePath = "github.com/mxschmitt/fritzbox_exporter"; + subPackages = [ "cmd/exporter" ]; - goDeps = ./fritzbox-exporter-deps.nix; + vendorSha256 = "0k6bd052pjfg5c1ba1yhni8msv3wl512vfzy2hrk49jibh8h052n"; passthru.tests = { inherit (nixosTests.prometheus-exporters) fritzbox; }; meta = with lib; { description = "Prometheus Exporter for FRITZ!Box (TR64 and UPnP)"; - homepage = "https://github.com/ndecker/fritzbox_exporter"; + homepage = "https://github.com/mxschmitt/fritzbox_exporter"; license = licenses.asl20; - maintainers = with maintainers; [ bachp flokli ]; + maintainers = with maintainers; [ bachp flokli sbruder ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index ef7b144a5b..d92219ea71 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.19.1"; + version = "1.19.3"; excludedPackages = "test"; @@ -12,15 +12,15 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-8shyNKwSg3pUxfQsIHBNnIaks/86vHuHN/SroDE3QFU="; + sha256 = "sha256-14nwSLCurI9vNgZwad3qc2/yrvpc8Og8jojTCAfJ5F0="; }; - vendorSha256 = "sha256-GMNyeWa2dz+q4RYS+DDkpj9sx1PlPvSuWYcHSM2umRE="; + vendorSha256 = "sha256-J48ezMi9+PxohDKFhBpbcu6fdojlZPXnQQw2IcyimTA="; proxyVendor = true; - preBuild = '' - buildFlagsArray+=("-ldflags=-w -s -X main.version=${version}") - ''; + ldflags = [ + "-w" "-s" "-X main.version=${version}" + ]; passthru.tests = { inherit (nixosTests) telegraf; }; diff --git a/third_party/nixpkgs/pkgs/servers/rpiplay/default.nix b/third_party/nixpkgs/pkgs/servers/rpiplay/default.nix new file mode 100644 index 0000000000..672c6746ab --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/rpiplay/default.nix @@ -0,0 +1,49 @@ +{ lib, stdenv, pkg-config, fetchFromGitHub, fetchpatch, cmake, wrapGAppsHook, avahi, avahi-compat, openssl, gst_all_1, libplist }: + +stdenv.mkDerivation rec { + pname = "rpiplay"; + version = "unstable-2021-06-14"; + + src = fetchFromGitHub { + owner = "FD-"; + repo = "RPiPlay"; + rev = "35dd995fceed29183cbfad0d4110ae48e0635786"; + sha256 = "sha256-qe7ZTT45NYvzgnhRmz15uGT/FnGi9uppbKVbmch5B9A="; + }; + + patches = [ + # allow rpiplay to be used with firewall enabled. + # sets static ports 7000 7100 (tcp) and 6000 6001 7011 (udp) + (fetchpatch { + name = "use-static-ports.patch"; + url = "https://github.com/FD-/RPiPlay/commit/2ffc287ba822e1d2b2ed0fc0e41a2bb3d9dab105.patch"; + sha256 = "08dy829gyhyzw2n54zn5m3176cmd24k5hij24vpww5bhbwkbabww"; + }) + ]; + + nativeBuildInputs = [ + cmake + openssl + libplist + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + avahi + avahi-compat + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + ]; + + meta = with lib; { + homepage = "https://github.com/FD-/RPiPlay"; + description = "An open-source implementation of an AirPlay mirroring server."; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ mschneider ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix b/third_party/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix index 36e26d38fc..c1ce4d9e1e 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix @@ -16,7 +16,7 @@ self = stdenv.mkDerivation rec { sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq"; }; - preConfigure = lib.optional stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' ln -s /bin/ps $TMPDIR/ps export PATH=$PATH:$TMPDIR ''; diff --git a/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix b/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix index 8e7c5a0425..e37789e7ee 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, bison, cmake, pkg-config , boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd -, numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl +, numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools }: let @@ -32,7 +32,7 @@ self = stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ numactl libtirpc ] ++ lib.optionals stdenv.isDarwin [ - cctools CoreServices developer_cmds + cctools CoreServices developer_cmds DarwinTools ]; outputs = [ "out" "static" ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix index bebe586769..f8e3f00b79 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.3.1"; + version = "2.4.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "0azcg8fh0bbc4a6b0mghdg4b9v62bb3haaq6cycj40fk4mf1dldx"; + sha256 = "0nc6nvngp5skz8rasvb7pyi9nlw642iwk19p17lizmw8swdm5nji"; }; - cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ] + cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] ++ lib.optionals stdenv.isDarwin [ "-DLINTER=OFF" ]; # Fix the install phase which tries to install into the pgsql extension dir, @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ volth marsam ]; platforms = postgresql.meta.platforms; license = licenses.asl20; + broken = versionOlder postgresql.version "12"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/squid/default.nix b/third_party/nixpkgs/pkgs/servers/squid/default.nix index dd3405d353..206e9fbb00 100644 --- a/third_party/nixpkgs/pkgs/servers/squid/default.nix +++ b/third_party/nixpkgs/pkgs/servers/squid/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squid"; - version = "4.15"; + version = "4.16"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz"; - sha256 = "sha256-tpOk5asoEaioVPYN4KYq+786lSux0EeVLJrgEyH4SiU="; + sha256 = "sha256-fgDokXV8HALa5UbJiY9EDGAxtoTYwkPW7atSkHbjumM="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/traefik/default.nix b/third_party/nixpkgs/pkgs/servers/traefik/default.nix index c3f9aa13cc..800f26d47b 100644 --- a/third_party/nixpkgs/pkgs/servers/traefik/default.nix +++ b/third_party/nixpkgs/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.4.13"; + version = "2.5.0"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-kGCzw8B7fCh6oh0ziB1eBedWEeGOBJVBvUf++TK/Lo0="; + sha256 = "sha256-8UqnMORAPENkVcWVbNHRje+rjIAlE8CMwBTLYrihBDw="; stripRoot = false; }; - vendorSha256 = "sha256-jn4Ud+MrX7no+s69LAAbDOoFg1yIQ2lmoy8r37JIVz8="; + vendorSha256 = "sha256-tBUW6iBZZYc2OgSzFcDZ1C8YnyrXnuy3SdQiy8FPksM="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix index 27c749dea2..2766b64534 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix @@ -8,6 +8,7 @@ in discourse-checklist = callPackage ./discourse-checklist {}; discourse-data-explorer = callPackage ./discourse-data-explorer {}; discourse-github = callPackage ./discourse-github {}; + discourse-ldap-auth = callPackage ./discourse-ldap-auth {}; discourse-math = callPackage ./discourse-math {}; discourse-migratepassword = callPackage ./discourse-migratepassword {}; discourse-solved = callPackage ./discourse-solved {}; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile new file mode 100644 index 0000000000..897a808c1d --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +gem 'pyu-ruby-sasl', '0.0.3.3', require: false +gem 'rubyntlm', '0.3.4', require: false +gem 'net-ldap', '0.14.0' +gem 'omniauth-ldap', '1.0.5' diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock new file mode 100644 index 0000000000..2843cb0d8f --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock @@ -0,0 +1,28 @@ +GEM + remote: https://rubygems.org/ + specs: + hashie (4.1.0) + net-ldap (0.14.0) + omniauth (1.9.1) + hashie (>= 3.4.6) + rack (>= 1.6.2, < 3) + omniauth-ldap (1.0.5) + net-ldap (~> 0.12) + omniauth (~> 1.0) + pyu-ruby-sasl (~> 0.0.3.2) + rubyntlm (~> 0.3.4) + pyu-ruby-sasl (0.0.3.3) + rack (2.2.3) + rubyntlm (0.3.4) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + net-ldap (= 0.14.0) + omniauth-ldap (= 1.0.5) + pyu-ruby-sasl (= 0.0.3.3) + rubyntlm (= 0.3.4) + +BUNDLED WITH + 2.2.20 diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix new file mode 100644 index 0000000000..92a3c2544c --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix @@ -0,0 +1,18 @@ +{ lib, mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin { + name = "discourse-ldap-auth"; + bundlerEnvArgs.gemdir = ./.; + src = fetchFromGitHub { + owner = "jonmbake"; + repo = "discourse-ldap-auth"; + rev = "eca02c560f2f2bf42feeb1923bc17e074f16b891"; + sha256 = "sha256-HLNoDvvxkBMvqP6WbRrJY0CYnK92W77nzSpuwgl0VPA="; + }; + meta = with lib; { + homepage = "https://github.com/jonmbake/discourse-ldap-auth"; + maintainers = with maintainers; [ ryantm ]; + license = licenses.mit; + description = "Discourse plugin to enable LDAP/Active Directory authentication."; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix new file mode 100644 index 0000000000..e684a50647 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix @@ -0,0 +1,74 @@ +{ + hashie = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02bsx12ihl78x0vdm37byp78jjw2ff6035y7rrmbd90qxjwxr43q"; + type = "gem"; + }; + version = "4.1.0"; + }; + net-ldap = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18fyxfbh32ai72cwgz8s9w0fg0xq7j534y217flw54mmzsj8i6qp"; + type = "gem"; + }; + version = "0.14.0"; + }; + omniauth = { + dependencies = ["hashie" "rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "002vi9gwamkmhf0dsj2im1d47xw2n1jfhnzl18shxf3ampkqfmyz"; + type = "gem"; + }; + version = "1.9.1"; + }; + omniauth-ldap = { + dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ld3mx46xa1qhc0cpnck1n06xcxs0ag4n41zgabxri27a772f9wz"; + type = "gem"; + }; + version = "1.0.5"; + }; + pyu-ruby-sasl = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rcpjiz9lrvyb3rd8k8qni0v4ps08psympffyldmmnrqayyad0sn"; + type = "gem"; + }; + version = "0.0.3.3"; + }; + rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + type = "gem"; + }; + version = "2.2.3"; + }; + rubyntlm = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18d1lxhx62swggf4cqg76h7hp04f5801c8h07w08cm9xng2niqby"; + type = "gem"; + }; + version = "0.3.4"; + }; +} 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 127088dafb..a207b0ebf3 100755 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/update.py +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/update.py @@ -206,6 +206,7 @@ def update_plugins(): {'name': 'discourse-checklist'}, {'name': 'discourse-data-explorer'}, {'name': 'discourse-github'}, + {'name': 'discourse-ldap-auth', 'owner': 'jonmbake'}, {'name': 'discourse-math'}, {'name': 'discourse-migratepassword', 'owner': 'discoursehosting'}, {'name': 'discourse-solved'}, diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/moodle/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/moodle/default.nix index bd90e908f1..d6fcedf8dc 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/moodle/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ] }: let - version = "3.11"; + version = "3.11.2"; stableVersion = lib.concatStrings (lib.take 2 (lib.splitVersion version)); in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "sha256-rZKY26ZPvubSr6nZ+Kguj1uKoEJbF3pEIKjjh6weyYo"; + sha256 = "sha256-owe/8CVz7+uBrHJQDN4csWVcdk49AvT1ip88lAe/tKg="; }; phpConfig = writeText "config.php" '' diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix index 20fc0f6f0c..fc7af3bcf2 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix @@ -1,19 +1,19 @@ { gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir -, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkg-config, nixosTests }: -with lib; gnustep.stdenv.mkDerivation rec { +, openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests }: +gnustep.stdenv.mkDerivation rec { pname = "SOGo"; - version = "5.1.1"; + version = "5.2.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOGo-${version}"; - sha256 = "19qkznk20fi47zxvg24hqnim5bpjlawk76w04jgd93yqakidl8ax"; + sha256 = "0y9im5y6ffdc7sy2qphq0xai4ig1ks7vj10vy4mn1psdlc5kd516"; }; nativeBuildInputs = [ gnustep.make makeWrapper python3 ]; - buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) libsodium libzip pkg-config ] - ++ optional (openldap != null) openldap; + buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config ] + ++ lib.optional (openldap != null) openldap; patches = [ # TODO: take a closer look at other patches in https://sources.debian.org/patches/sogo/ and https://github.com/Skrupellos/sogo-patches @@ -68,7 +68,7 @@ with lib; gnustep.stdenv.mkDerivation rec { passthru.tests.sogo = nixosTests.sogo; - meta = { + meta = with lib; { description = "A very fast and scalable modern collaboration suite (groupware)"; license = with licenses; [ gpl2Only lgpl21Only ]; homepage = "https://sogo.nu/"; diff --git a/third_party/nixpkgs/pkgs/shells/powershell/default.nix b/third_party/nixpkgs/pkgs/shells/powershell/default.nix index 135cfb40ff..5c082641e9 100644 --- a/third_party/nixpkgs/pkgs/shells/powershell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/powershell/default.nix @@ -8,7 +8,7 @@ let archString = if stdenv.isAarch64 then "arm64" else if stdenv.isLinux then "linux" else throw "unsupported platform"; platformSha = if stdenv.isDarwin then "0w44ws8b6zfixf7xz93hmplqsx18279n9x8j77y4rbzs13fldvsn" - else if (stdenv.isLinux && stdenv.isx86_64) then "0xm7l49zhkz2fly3d751kjd5cy3ws9zji9i0061lkd06dvkch7jy" + else if (stdenv.isLinux && stdenv.isx86_64) then "sha256-SOZn7CGLu9x+xhQwjgm0SL7sKDODLwHRpzi7tMdRBAM=" else if (stdenv.isLinux && stdenv.isAarch64) then "1axbi4kmb1ydys7c45jhp729w1srid3c8jgivb4bdmdp56rf6h32" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" @@ -19,7 +19,7 @@ let archString = if stdenv.isAarch64 then "arm64" in stdenv.mkDerivation rec { pname = "powershell"; - version = "7.1.3"; + version = "7.1.4"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-${archString}.tar.gz"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { rm -f $pslibs/libcrypto${ext}.1.0.0 rm -f $pslibs/libssl${ext}.1.0.0 - # At least the 7.1.3-osx package does not have the executable bit set. + # At least the 7.1.4-osx package does not have the executable bit set. chmod a+x $pslibs/pwsh ls $pslibs diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index 23c783246e..7decd474e1 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-04-26"; + version = "2021-08-18"; pname = "oh-my-zsh"; - rev = "63a7422d8dd5eb93c849df0ab9e679e6f333818a"; + rev = "cbb534267aca09fd123635fc39a7d00c0e21a5f7"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "1spi6y5jmha0bf1s69mycpmksxjniqmcnvkvmza4rhji8v8b120w"; + sha256 = "LbgqdIGVvcTUSDVSyH8uJmfuT0ymJvf04AL91HjNWwQ="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/stdenv/adapters.nix b/third_party/nixpkgs/pkgs/stdenv/adapters.nix index a8e984d617..719f679982 100644 --- a/third_party/nixpkgs/pkgs/stdenv/adapters.nix +++ b/third_party/nixpkgs/pkgs/stdenv/adapters.nix @@ -2,7 +2,31 @@ a new stdenv with different behaviour, e.g. using a different C compiler. */ -pkgs: +{ lib, pkgs, config }: + +let + # N.B. Keep in sync with default arg for stdenv/generic. + defaultMkDerivationFromStdenv = import ./generic/make-derivation.nix { inherit lib config; }; + + # Low level function to help with overriding `mkDerivationFromStdenv`. One + # gives it the old stdenv arguments and a "continuation" function, and + # underneath the final stdenv argument it yields to the continuation to do + # whatever it wants with old `mkDerivation` (old `mkDerivationFromStdenv` + # applied to the *new, final* stdenv) provided for convenience. + withOldMkDerivation = stdenvSuperArgs: k: stdenvSelf: let + mkDerivationFromStdenv-super = stdenvSuperArgs.mkDerivationFromStdenv or defaultMkDerivationFromStdenv; + mkDerivationSuper = mkDerivationFromStdenv-super stdenvSelf; + in + k stdenvSelf mkDerivationSuper; + + # Wrap the original `mkDerivation` providing extra args to it. + extendMkDerivationArgs = old: f: withOldMkDerivation old (_: mkDerivationSuper: args: + mkDerivationSuper (args // f args)); + + # Wrap the original `mkDerivation` transforming the result. + overrideMkDerivationResult = old: f: withOldMkDerivation old (_: mkDerivationSuper: args: + f (mkDerivationSuper args)); +in rec { @@ -31,33 +55,32 @@ rec { # Return a modified stdenv that tries to build statically linked # binaries. - makeStaticBinaries = stdenv: - let stdenv' = if stdenv.hostPlatform.libc != "glibc" then stdenv else - stdenv.override (prev: { - extraBuildInputs = (prev.extraBuildInputs or []) ++ [ - stdenv.glibc.static - ]; - }); - in stdenv' // - { mkDerivation = args: - if stdenv'.hostPlatform.isDarwin + makeStaticBinaries = stdenv0: + stdenv0.override (old: { + mkDerivationFromStdenv = withOldMkDerivation old (stdenv: mkDerivationSuper: args: + if stdenv.hostPlatform.isDarwin then throw "Cannot build fully static binaries on Darwin/macOS" - else stdenv'.mkDerivation (args // { + else mkDerivationSuper (args // { NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -static"; - } // pkgs.lib.optionalAttrs (!(args.dontAddStaticConfigureFlags or false)) { + } // lib.optionalAttrs (!(args.dontAddStaticConfigureFlags or false)) { configureFlags = (args.configureFlags or []) ++ [ "--disable-shared" # brrr... ]; - }); - }; + })); + } // lib.optionalAttrs (stdenv0.hostPlatform.libc == "libc") { + extraBuildInputs = (old.extraBuildInputs or []) ++ [ + stdenv0.glibc.static + ]; + }); # Return a modified stdenv that builds static libraries instead of # shared libraries. - makeStaticLibraries = stdenv: stdenv // - { mkDerivation = args: stdenv.mkDerivation (args // { + makeStaticLibraries = stdenv: + stdenv.override (old: { + mkDerivationFromStdenv = extendMkDerivationArgs old (args: { dontDisableStatic = true; - } // pkgs.lib.optionalAttrs (!(args.dontAddStaticConfigureFlags or false)) { + } // lib.optionalAttrs (!(args.dontAddStaticConfigureFlags or false)) { configureFlags = (args.configureFlags or []) ++ [ "--enable-static" "--disable-shared" @@ -65,18 +88,19 @@ rec { cmakeFlags = (args.cmakeFlags or []) ++ [ "-DBUILD_SHARED_LIBS:BOOL=OFF" ]; mesonFlags = (args.mesonFlags or []) ++ [ "-Ddefault_library=static" ]; }); - }; + }); /* Modify a stdenv so that all buildInputs are implicitly propagated to consuming derivations */ - propagateBuildInputs = stdenv: stdenv // - { mkDerivation = args: stdenv.mkDerivation (args // { + propagateBuildInputs = stdenv: + stdenv.override (old: { + mkDerivationFromStdenv = extendMkDerivationArgs old (args: { propagatedBuildInputs = (args.propagatedBuildInputs or []) ++ (args.buildInputs or []); buildInputs = []; }); - }; + }); /* Modify a stdenv so that the specified attributes are added to @@ -88,8 +112,9 @@ rec { { NIX_CFLAGS_COMPILE = "-O0"; } stdenv; */ - addAttrsToDerivation = extraAttrs: stdenv: stdenv // - { mkDerivation = args: stdenv.mkDerivation (args // extraAttrs); }; + addAttrsToDerivation = extraAttrs: stdenv: stdenv.override (old: { + mkDerivationFromStdenv = extendMkDerivationArgs old (_: extraAttrs); + }); /* Return a modified stdenv that builds packages with GCC's coverage @@ -110,21 +135,20 @@ rec { # remove all maintainers. defaultStdenv = replaceMaintainersField allStdenvs.stdenv pkgs []; */ - replaceMaintainersField = stdenv: pkgs: maintainers: stdenv // - { mkDerivation = args: - pkgs.lib.recursiveUpdate - (stdenv.mkDerivation args) - { meta.maintainers = maintainers; }; - }; + replaceMaintainersField = stdenv: pkgs: maintainers: + stdenv.override (old: { + mkDerivationFromStdenv = overrideMkDerivationResult (pkg: + lib.recursiveUpdate pkg { meta.maintainers = maintainers; }); + }); /* Use the trace output to report all processed derivations with their license name. */ - traceDrvLicenses = stdenv: stdenv // - { mkDerivation = args: + traceDrvLicenses = stdenv: + stdenv.override (old: { + mkDerivationFromStdenv = overrideMkDerivationResult (pkg: let - pkg = stdenv.mkDerivation args; printDrvPath = val: let drvPath = builtins.unsafeDiscardStringContext pkg.drvPath; license = pkg.meta.license or null; @@ -133,8 +157,8 @@ rec { in pkg // { outPath = printDrvPath pkg.outPath; drvPath = printDrvPath pkg.drvPath; - }; - }; + }); + }); /* Abort if the license predicate is not verified for a derivation @@ -152,10 +176,10 @@ rec { use it by patching the all-packages.nix file or by using the override feature of ~/.config/nixpkgs/config.nix . */ - validateLicenses = licensePred: stdenv: stdenv // - { mkDerivation = args: + validateLicenses = licensePred: stdenv: + stdenv.override (old: { + mkDerivationFromStdenv = overrideMkDerivationResult (pkg: let - pkg = stdenv.mkDerivation args; drv = builtins.unsafeDiscardStringContext pkg.drvPath; license = pkg.meta.license or @@ -175,40 +199,43 @@ rec { in pkg // { outPath = validate pkg.outPath; drvPath = validate pkg.drvPath; - }; - }; + }); + }); /* Modify a stdenv so that it produces debug builds; that is, binaries have debug info, and compiler optimisations are disabled. */ - keepDebugInfo = stdenv: stdenv // - { mkDerivation = args: stdenv.mkDerivation (args // { + keepDebugInfo = stdenv: + stdenv.override (old: { + mkDerivationFromStdenv = extendMkDerivationArgs old (args: { dontStrip = true; NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -ggdb -Og"; }); - }; + }); /* Modify a stdenv so that it uses the Gold linker. */ - useGoldLinker = stdenv: stdenv // - { mkDerivation = args: stdenv.mkDerivation (args // { + useGoldLinker = stdenv: + stdenv.override (old: { + mkDerivationFromStdenv = extendMkDerivationArgs old (args: { NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -fuse-ld=gold"; }); - }; + }); /* Modify a stdenv so that it builds binaries optimized specifically for the machine they are built on. WARNING: this breaks purity! */ - impureUseNativeOptimizations = stdenv: stdenv // - { mkDerivation = args: stdenv.mkDerivation (args // { + impureUseNativeOptimizations = stdenv: + stdenv.override (old: { + mkDerivationFromStdenv = extendMkDerivationArgs old (args: { NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -march=native"; NIX_ENFORCE_NO_NATIVE = false; preferLocalBuild = true; allowSubstitutes = false; }); - }; + }); } diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/default.nix b/third_party/nixpkgs/pkgs/stdenv/generic/default.nix index 88ca1b2c79..d7fb1b0ba0 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/default.nix @@ -48,6 +48,10 @@ let lib = import ../../../lib; in lib.makeOverridable ( , # The platform which build tools (especially compilers) build for in this stage, targetPlatform + +, # The implementation of `mkDerivation`, parameterized with the final stdenv so we can tie the knot. + # This is convient to have as a parameter so the stdenv "adapters" work better + mkDerivationFromStdenv ? import ./make-derivation.nix { inherit lib config; } }: let @@ -155,9 +159,7 @@ let # to correct type of machine. inherit (hostPlatform) system; - inherit (import ./make-derivation.nix { - inherit lib config stdenv; - }) mkDerivation; + mkDerivation = mkDerivationFromStdenv stdenv; inherit fetchurlBoot; diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix index d6704d5911..56cfa0c503 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix @@ -1,4 +1,6 @@ -{ lib, config, stdenv }: +{ lib, config }: + +stdenv: let checkMeta = import ./check-meta.nix { @@ -7,405 +9,403 @@ let # to build it. This is a bit confusing for cross compilation. inherit (stdenv) hostPlatform; }; -in rec { - # `mkDerivation` wraps the builtin `derivation` function to - # produce derivations that use this stdenv and its shell. +in + +# `mkDerivation` wraps the builtin `derivation` function to +# produce derivations that use this stdenv and its shell. +# +# See also: +# +# * https://nixos.org/nixpkgs/manual/#sec-using-stdenv +# Details on how to use this mkDerivation function +# +# * https://nixos.org/nix/manual/#ssec-derivation +# Explanation about derivations in general +{ + +# These types of dependencies are all exhaustively documented in +# the "Specifying Dependencies" section of the "Standard +# Environment" chapter of the Nixpkgs manual. + +# TODO(@Ericson2314): Stop using legacy dep attribute names + +# host offset -> target offset + depsBuildBuild ? [] # -1 -> -1 +, depsBuildBuildPropagated ? [] # -1 -> -1 +, nativeBuildInputs ? [] # -1 -> 0 N.B. Legacy name +, propagatedNativeBuildInputs ? [] # -1 -> 0 N.B. Legacy name +, depsBuildTarget ? [] # -1 -> 1 +, depsBuildTargetPropagated ? [] # -1 -> 1 + +, depsHostHost ? [] # 0 -> 0 +, depsHostHostPropagated ? [] # 0 -> 0 +, buildInputs ? [] # 0 -> 1 N.B. Legacy name +, propagatedBuildInputs ? [] # 0 -> 1 N.B. Legacy name + +, depsTargetTarget ? [] # 1 -> 1 +, depsTargetTargetPropagated ? [] # 1 -> 1 + +, checkInputs ? [] +, installCheckInputs ? [] + +# Configure Phase +, configureFlags ? [] +, cmakeFlags ? [] +, mesonFlags ? [] +, # Target is not included by default because most programs don't care. + # Including it then would cause needless mass rebuilds. # - # See also: - # - # * https://nixos.org/nixpkgs/manual/#sec-using-stdenv - # Details on how to use this mkDerivation function - # - # * https://nixos.org/nix/manual/#ssec-derivation - # Explanation about derivations in general - mkDerivation = - { + # TODO(@Ericson2314): Make [ "build" "host" ] always the default. + configurePlatforms ? lib.optionals + (stdenv.hostPlatform != stdenv.buildPlatform) + [ "build" "host" ] - # These types of dependencies are all exhaustively documented in - # the "Specifying Dependencies" section of the "Standard - # Environment" chapter of the Nixpkgs manual. +# TODO(@Ericson2314): Make unconditional / resolve #33599 +# Check phase +, doCheck ? config.doCheckByDefault or false - # TODO(@Ericson2314): Stop using legacy dep attribute names +# TODO(@Ericson2314): Make unconditional / resolve #33599 +# InstallCheck phase +, doInstallCheck ? config.doCheckByDefault or false - # host offset -> target offset - depsBuildBuild ? [] # -1 -> -1 - , depsBuildBuildPropagated ? [] # -1 -> -1 - , nativeBuildInputs ? [] # -1 -> 0 N.B. Legacy name - , propagatedNativeBuildInputs ? [] # -1 -> 0 N.B. Legacy name - , depsBuildTarget ? [] # -1 -> 1 - , depsBuildTargetPropagated ? [] # -1 -> 1 +, # TODO(@Ericson2314): Make always true and remove + strictDeps ? stdenv.hostPlatform != stdenv.buildPlatform +, meta ? {} +, passthru ? {} +, pos ? # position used in error messages and for meta.position + (if attrs.meta.description or null != null + then builtins.unsafeGetAttrPos "description" attrs.meta + else if attrs.version or null != null + then builtins.unsafeGetAttrPos "version" attrs + else builtins.unsafeGetAttrPos "name" attrs) +, separateDebugInfo ? false +, outputs ? [ "out" ] +, __darwinAllowLocalNetworking ? false +, __impureHostDeps ? [] +, __propagatedImpureHostDeps ? [] +, sandboxProfile ? "" +, propagatedSandboxProfile ? "" - , depsHostHost ? [] # 0 -> 0 - , depsHostHostPropagated ? [] # 0 -> 0 - , buildInputs ? [] # 0 -> 1 N.B. Legacy name - , propagatedBuildInputs ? [] # 0 -> 1 N.B. Legacy name +, hardeningEnable ? [] +, hardeningDisable ? [] - , depsTargetTarget ? [] # 1 -> 1 - , depsTargetTargetPropagated ? [] # 1 -> 1 +, patches ? [] - , checkInputs ? [] - , installCheckInputs ? [] +, __contentAddressed ? + (! attrs ? outputHash) # Fixed-output drvs can't be content addressed too + && (config.contentAddressedByDefault or false) - # Configure Phase - , configureFlags ? [] - , cmakeFlags ? [] - , mesonFlags ? [] - , # Target is not included by default because most programs don't care. - # Including it then would cause needless mass rebuilds. +, ... } @ attrs: + +let + # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when + # no package has `doCheck = true`. + doCheck' = doCheck && stdenv.hostPlatform == stdenv.buildPlatform; + doInstallCheck' = doInstallCheck && stdenv.hostPlatform == stdenv.buildPlatform; + + separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux && !(stdenv.hostPlatform.useLLVM or false); + outputs' = outputs ++ lib.optional separateDebugInfo' "debug"; + + noNonNativeDeps = builtins.length (depsBuildTarget ++ depsBuildTargetPropagated + ++ depsHostHost ++ depsHostHostPropagated + ++ buildInputs ++ propagatedBuildInputs + ++ depsTargetTarget ++ depsTargetTargetPropagated) == 0; + dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || !stdenv.hasCC; + supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ]; + # Musl-based platforms will keep "pie", other platforms will not. + # If you change this, make sure to update section `{#sec-hardening-in-nixpkgs}` + # in the nixpkgs manual to inform users about the defaults. + defaultHardeningFlags = if stdenv.hostPlatform.isMusl && + # Except when: + # - static aarch64, where compilation works, but produces segfaulting dynamically linked binaries. + # - static armv7l, where compilation fails. + !((stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) && stdenv.hostPlatform.isStatic) + then supportedHardeningFlags + else lib.remove "pie" supportedHardeningFlags; + enabledHardeningOptions = + if builtins.elem "all" hardeningDisable + then [] + else lib.subtractLists hardeningDisable (defaultHardeningFlags ++ hardeningEnable); + # hardeningDisable additionally supports "all". + erroneousHardeningFlags = lib.subtractLists supportedHardeningFlags (hardeningEnable ++ lib.remove "all" hardeningDisable); +in if builtins.length erroneousHardeningFlags != 0 +then abort ("mkDerivation was called with unsupported hardening flags: " + lib.generators.toPretty {} { + inherit erroneousHardeningFlags hardeningDisable hardeningEnable supportedHardeningFlags; +}) +else let + doCheck = doCheck'; + doInstallCheck = doInstallCheck'; + + outputs = outputs'; + + references = nativeBuildInputs ++ buildInputs + ++ propagatedNativeBuildInputs ++ propagatedBuildInputs; + + dependencies = map (map lib.chooseDevOutputs) [ + [ + (map (drv: drv.__spliced.buildBuild or drv) depsBuildBuild) + (map (drv: drv.nativeDrv or drv) nativeBuildInputs + ++ lib.optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh + ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh + ++ lib.optionals doCheck checkInputs + ++ lib.optionals doInstallCheck' installCheckInputs) + (map (drv: drv.__spliced.buildTarget or drv) depsBuildTarget) + ] + [ + (map (drv: drv.__spliced.hostHost or drv) depsHostHost) + (map (drv: drv.crossDrv or drv) buildInputs) + ] + [ + (map (drv: drv.__spliced.targetTarget or drv) depsTargetTarget) + ] + ]; + propagatedDependencies = map (map lib.chooseDevOutputs) [ + [ + (map (drv: drv.__spliced.buildBuild or drv) depsBuildBuildPropagated) + (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs) + (map (drv: drv.__spliced.buildTarget or drv) depsBuildTargetPropagated) + ] + [ + (map (drv: drv.__spliced.hostHost or drv) depsHostHostPropagated) + (map (drv: drv.crossDrv or drv) propagatedBuildInputs) + ] + [ + (map (drv: drv.__spliced.targetTarget or drv) depsTargetTargetPropagated) + ] + ]; + + computedSandboxProfile = + lib.concatMap (input: input.__propagatedSandboxProfile or []) + (stdenv.extraNativeBuildInputs + ++ stdenv.extraBuildInputs + ++ lib.concatLists dependencies); + + computedPropagatedSandboxProfile = + lib.concatMap (input: input.__propagatedSandboxProfile or []) + (lib.concatLists propagatedDependencies); + + computedImpureHostDeps = + lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) + (stdenv.extraNativeBuildInputs + ++ stdenv.extraBuildInputs + ++ lib.concatLists dependencies)); + + computedPropagatedImpureHostDeps = + lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) + (lib.concatLists propagatedDependencies)); + + derivationArg = + (removeAttrs attrs + ["meta" "passthru" "pos" + "checkInputs" "installCheckInputs" + "__darwinAllowLocalNetworking" + "__impureHostDeps" "__propagatedImpureHostDeps" + "sandboxProfile" "propagatedSandboxProfile"]) + // (lib.optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) { + name = + let + # Indicate the host platform of the derivation if cross compiling. + # Fixed-output derivations like source tarballs shouldn't get a host + # suffix. But we have some weird ones with run-time deps that are + # just used for their side-affects. Those might as well since the + # hash can't be the same. See #32986. + hostSuffix = lib.optionalString + (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix) + "-${stdenv.hostPlatform.config}"; + # Disambiguate statically built packages. This was originally + # introduce as a means to prevent nix-env to get confused between + # nix and nixStatic. This should be also achieved by moving the + # hostSuffix before the version, so we could contemplate removing + # it again. + staticMarker = lib.optionalString stdenv.hostPlatform.isStatic "-static"; + in + if attrs ? name + then attrs.name + hostSuffix + else "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}"; + }) // { + builder = attrs.realBuilder or stdenv.shell; + args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; + inherit stdenv; + + # The `system` attribute of a derivation has special meaning to Nix. + # Derivations set it to choose what sort of machine could be used to + # execute the build, The build platform entirely determines this, + # indeed more finely than Nix knows or cares about. The `system` + # attribute of `buildPlatfom` matches Nix's degree of specificity. + # exactly. + inherit (stdenv.buildPlatform) system; + + userHook = config.stdenv.userHook or null; + __ignoreNulls = true; + + inherit strictDeps; + + depsBuildBuild = lib.elemAt (lib.elemAt dependencies 0) 0; + nativeBuildInputs = lib.elemAt (lib.elemAt dependencies 0) 1; + depsBuildTarget = lib.elemAt (lib.elemAt dependencies 0) 2; + depsHostHost = lib.elemAt (lib.elemAt dependencies 1) 0; + buildInputs = lib.elemAt (lib.elemAt dependencies 1) 1; + depsTargetTarget = lib.elemAt (lib.elemAt dependencies 2) 0; + + depsBuildBuildPropagated = lib.elemAt (lib.elemAt propagatedDependencies 0) 0; + propagatedNativeBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 0) 1; + depsBuildTargetPropagated = lib.elemAt (lib.elemAt propagatedDependencies 0) 2; + depsHostHostPropagated = lib.elemAt (lib.elemAt propagatedDependencies 1) 0; + propagatedBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 1) 1; + depsTargetTargetPropagated = lib.elemAt (lib.elemAt propagatedDependencies 2) 0; + + # This parameter is sometimes a string, sometimes null, and sometimes a list, yuck + configureFlags = let inherit (lib) optional elem; in + (/**/ if lib.isString configureFlags then [configureFlags] + else if configureFlags == null then [] + else configureFlags) + ++ optional (elem "build" configurePlatforms) "--build=${stdenv.buildPlatform.config}" + ++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}" + ++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}"; + + inherit patches; + + inherit doCheck doInstallCheck; + + inherit outputs; + } // lib.optionalAttrs (__contentAddressed) { + inherit __contentAddressed; + # Provide default values for outputHashMode and outputHashAlgo because + # most people won't care about these anyways + outputHashAlgo = attrs.outputHashAlgo or "sha256"; + outputHashMode = attrs.outputHashMode or "recursive"; + } // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { + cmakeFlags = + (/**/ if lib.isString cmakeFlags then [cmakeFlags] + else if cmakeFlags == null then [] + else cmakeFlags) + ++ [ "-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" ( + lib.optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}"] + ++ lib.optional (stdenv.hostPlatform.uname.processor != null) "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}" + ++ lib.optional (stdenv.hostPlatform.uname.release != null) "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.release}" + ++ lib.optional (stdenv.hostPlatform.isDarwin) "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" + ++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}" + ++ lib.optional (stdenv.buildPlatform.uname.processor != null) "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}" + ++ lib.optional (stdenv.buildPlatform.uname.release != null) "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}"; + + mesonFlags = if mesonFlags == null then null else let + # See https://mesonbuild.com/Reference-tables.html#cpu-families + cpuFamily = platform: with platform; + /**/ if isAarch32 then "arm" + else if isAarch64 then "aarch64" + else if isx86_32 then "x86" + else if isx86_64 then "x86_64" + else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits; + crossFile = builtins.toFile "cross-file.conf" '' + [properties] + needs_exe_wrapper = true + + [host_machine] + system = '${stdenv.targetPlatform.parsed.kernel.name}' + cpu_family = '${cpuFamily stdenv.targetPlatform}' + cpu = '${stdenv.targetPlatform.parsed.cpu.name}' + endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} + ''; + in [ "--cross-file=${crossFile}" ] ++ mesonFlags; + } // lib.optionalAttrs (attrs.enableParallelBuilding or false) { + enableParallelChecking = attrs.enableParallelChecking or true; + } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != [] || stdenv.hostPlatform.isMusl) { + NIX_HARDENING_ENABLE = enabledHardeningOptions; + } // lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform ? gcc.arch) { + requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.gcc.arch}" ]; + } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { + inherit __darwinAllowLocalNetworking; + # TODO: remove lib.unique once nix has a list canonicalization primitive + __sandboxProfile = + let profiles = [ stdenv.extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ]; + final = lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.unique profiles)); + in final; + __propagatedSandboxProfile = lib.unique (computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]); + __impureHostDeps = computedImpureHostDeps ++ computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps ++ __impureHostDeps ++ stdenv.__extraImpureHostDeps ++ [ + "/dev/zero" + "/dev/random" + "/dev/urandom" + "/bin/sh" + ]; + __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps; + }; + + validity = checkMeta { inherit meta attrs; }; + + # The meta attribute is passed in the resulting attribute set, + # but it's not part of the actual derivation, i.e., it's not + # passed to the builder and is not a dependency. But since we + # include it in the result, it *is* available to nix-env for queries. + meta = { + # `name` above includes cross-compilation cruft (and is under assert), + # lets have a clean always accessible version here. + name = attrs.name or "${attrs.pname}-${attrs.version}"; + + # If the packager hasn't specified `outputsToInstall`, choose a default, + # which is the name of `p.bin or p.out or p` along with `p.man` when + # present. # - # TODO(@Ericson2314): Make [ "build" "host" ] always the default. - configurePlatforms ? lib.optionals - (stdenv.hostPlatform != stdenv.buildPlatform) - [ "build" "host" ] + # If the packager has specified it, it will be overridden below in + # `// meta`. + # + # Note: This default probably shouldn't be globally configurable. + # Services and users should specify outputs explicitly, + # unless they are comfortable with this default. + outputsToInstall = + let + hasOutput = out: builtins.elem out outputs; + in [( lib.findFirst hasOutput null (["bin" "out"] ++ outputs) )] + ++ lib.optional (hasOutput "man") "man"; + } + // attrs.meta or {} + # Fill `meta.position` to identify the source location of the package. + // lib.optionalAttrs (pos != null) { + position = pos.file + ":" + toString pos.line; + } // { + # Expose the result of the checks for everyone to see. + inherit (validity) unfree broken unsupported insecure; + available = validity.valid + && (if config.checkMetaRecursively or false + then lib.all (d: d.meta.available or true) references + else true); + }; - # TODO(@Ericson2314): Make unconditional / resolve #33599 - # Check phase - , doCheck ? config.doCheckByDefault or false +in - # TODO(@Ericson2314): Make unconditional / resolve #33599 - # InstallCheck phase - , doInstallCheck ? config.doCheckByDefault or false +lib.extendDerivation + validity.handled + ({ + overrideAttrs = f: stdenv.mkDerivation (attrs // (f attrs)); - , # TODO(@Ericson2314): Make always true and remove - strictDeps ? stdenv.hostPlatform != stdenv.buildPlatform - , meta ? {} - , passthru ? {} - , pos ? # position used in error messages and for meta.position - (if attrs.meta.description or null != null - then builtins.unsafeGetAttrPos "description" attrs.meta - else if attrs.version or null != null - then builtins.unsafeGetAttrPos "version" attrs - else builtins.unsafeGetAttrPos "name" attrs) - , separateDebugInfo ? false - , outputs ? [ "out" ] - , __darwinAllowLocalNetworking ? false - , __impureHostDeps ? [] - , __propagatedImpureHostDeps ? [] - , sandboxProfile ? "" - , propagatedSandboxProfile ? "" + # A derivation that always builds successfully and whose runtime + # dependencies are the original derivations build time dependencies + # This allows easy building and distributing of all derivations + # needed to enter a nix-shell with + # nix-build shell.nix -A inputDerivation + inputDerivation = derivation (derivationArg // { + # Add a name in case the original drv didn't have one + name = derivationArg.name or "inputDerivation"; + # This always only has one output + outputs = [ "out" ]; - , hardeningEnable ? [] - , hardeningDisable ? [] + # Propagate the original builder and arguments, since we override + # them and they might contain references to build inputs + _derivation_original_builder = derivationArg.builder; + _derivation_original_args = derivationArg.args; - , patches ? [] + builder = stdenv.shell; + # The bash builtin `export` dumps all current environment variables, + # which is where all build input references end up (e.g. $PATH for + # binaries). By writing this to $out, Nix can find and register + # them as runtime dependencies (since Nix greps for store paths + # through $out to find them) + args = [ "-c" "export > $out" ]; + }); - , __contentAddressed ? - (! attrs ? outputHash) # Fixed-output drvs can't be content addressed too - && (config.contentAddressedByDefault or false) - - , ... } @ attrs: - - let - # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when - # no package has `doCheck = true`. - doCheck' = doCheck && stdenv.hostPlatform == stdenv.buildPlatform; - doInstallCheck' = doInstallCheck && stdenv.hostPlatform == stdenv.buildPlatform; - - separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux && !(stdenv.hostPlatform.useLLVM or false); - outputs' = outputs ++ lib.optional separateDebugInfo' "debug"; - - noNonNativeDeps = builtins.length (depsBuildTarget ++ depsBuildTargetPropagated - ++ depsHostHost ++ depsHostHostPropagated - ++ buildInputs ++ propagatedBuildInputs - ++ depsTargetTarget ++ depsTargetTargetPropagated) == 0; - dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || !stdenv.hasCC; - supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ]; - # Musl-based platforms will keep "pie", other platforms will not. - # If you change this, make sure to update section `{#sec-hardening-in-nixpkgs}` - # in the nixpkgs manual to inform users about the defaults. - defaultHardeningFlags = if stdenv.hostPlatform.isMusl && - # Except when: - # - static aarch64, where compilation works, but produces segfaulting dynamically linked binaries. - # - static armv7l, where compilation fails. - !((stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) && stdenv.hostPlatform.isStatic) - then supportedHardeningFlags - else lib.remove "pie" supportedHardeningFlags; - enabledHardeningOptions = - if builtins.elem "all" hardeningDisable - then [] - else lib.subtractLists hardeningDisable (defaultHardeningFlags ++ hardeningEnable); - # hardeningDisable additionally supports "all". - erroneousHardeningFlags = lib.subtractLists supportedHardeningFlags (hardeningEnable ++ lib.remove "all" hardeningDisable); - in if builtins.length erroneousHardeningFlags != 0 - then abort ("mkDerivation was called with unsupported hardening flags: " + lib.generators.toPretty {} { - inherit erroneousHardeningFlags hardeningDisable hardeningEnable supportedHardeningFlags; - }) - else let - doCheck = doCheck'; - doInstallCheck = doInstallCheck'; - - outputs = outputs'; - - references = nativeBuildInputs ++ buildInputs - ++ propagatedNativeBuildInputs ++ propagatedBuildInputs; - - dependencies = map (map lib.chooseDevOutputs) [ - [ - (map (drv: drv.__spliced.buildBuild or drv) depsBuildBuild) - (map (drv: drv.nativeDrv or drv) nativeBuildInputs - ++ lib.optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh - ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh - ++ lib.optionals doCheck checkInputs - ++ lib.optionals doInstallCheck' installCheckInputs) - (map (drv: drv.__spliced.buildTarget or drv) depsBuildTarget) - ] - [ - (map (drv: drv.__spliced.hostHost or drv) depsHostHost) - (map (drv: drv.crossDrv or drv) buildInputs) - ] - [ - (map (drv: drv.__spliced.targetTarget or drv) depsTargetTarget) - ] - ]; - propagatedDependencies = map (map lib.chooseDevOutputs) [ - [ - (map (drv: drv.__spliced.buildBuild or drv) depsBuildBuildPropagated) - (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs) - (map (drv: drv.__spliced.buildTarget or drv) depsBuildTargetPropagated) - ] - [ - (map (drv: drv.__spliced.hostHost or drv) depsHostHostPropagated) - (map (drv: drv.crossDrv or drv) propagatedBuildInputs) - ] - [ - (map (drv: drv.__spliced.targetTarget or drv) depsTargetTargetPropagated) - ] - ]; - - computedSandboxProfile = - lib.concatMap (input: input.__propagatedSandboxProfile or []) - (stdenv.extraNativeBuildInputs - ++ stdenv.extraBuildInputs - ++ lib.concatLists dependencies); - - computedPropagatedSandboxProfile = - lib.concatMap (input: input.__propagatedSandboxProfile or []) - (lib.concatLists propagatedDependencies); - - computedImpureHostDeps = - lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) - (stdenv.extraNativeBuildInputs - ++ stdenv.extraBuildInputs - ++ lib.concatLists dependencies)); - - computedPropagatedImpureHostDeps = - lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) - (lib.concatLists propagatedDependencies)); - - derivationArg = - (removeAttrs attrs - ["meta" "passthru" "pos" - "checkInputs" "installCheckInputs" - "__darwinAllowLocalNetworking" - "__impureHostDeps" "__propagatedImpureHostDeps" - "sandboxProfile" "propagatedSandboxProfile"]) - // (lib.optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) { - name = - let - # Indicate the host platform of the derivation if cross compiling. - # Fixed-output derivations like source tarballs shouldn't get a host - # suffix. But we have some weird ones with run-time deps that are - # just used for their side-affects. Those might as well since the - # hash can't be the same. See #32986. - hostSuffix = lib.optionalString - (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix) - "-${stdenv.hostPlatform.config}"; - # Disambiguate statically built packages. This was originally - # introduce as a means to prevent nix-env to get confused between - # nix and nixStatic. This should be also achieved by moving the - # hostSuffix before the version, so we could contemplate removing - # it again. - staticMarker = lib.optionalString stdenv.hostPlatform.isStatic "-static"; - in - if attrs ? name - then attrs.name + hostSuffix - else "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}"; - }) // { - builder = attrs.realBuilder or stdenv.shell; - args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; - inherit stdenv; - - # The `system` attribute of a derivation has special meaning to Nix. - # Derivations set it to choose what sort of machine could be used to - # execute the build, The build platform entirely determines this, - # indeed more finely than Nix knows or cares about. The `system` - # attribute of `buildPlatfom` matches Nix's degree of specificity. - # exactly. - inherit (stdenv.buildPlatform) system; - - userHook = config.stdenv.userHook or null; - __ignoreNulls = true; - - inherit strictDeps; - - depsBuildBuild = lib.elemAt (lib.elemAt dependencies 0) 0; - nativeBuildInputs = lib.elemAt (lib.elemAt dependencies 0) 1; - depsBuildTarget = lib.elemAt (lib.elemAt dependencies 0) 2; - depsHostHost = lib.elemAt (lib.elemAt dependencies 1) 0; - buildInputs = lib.elemAt (lib.elemAt dependencies 1) 1; - depsTargetTarget = lib.elemAt (lib.elemAt dependencies 2) 0; - - depsBuildBuildPropagated = lib.elemAt (lib.elemAt propagatedDependencies 0) 0; - propagatedNativeBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 0) 1; - depsBuildTargetPropagated = lib.elemAt (lib.elemAt propagatedDependencies 0) 2; - depsHostHostPropagated = lib.elemAt (lib.elemAt propagatedDependencies 1) 0; - propagatedBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 1) 1; - depsTargetTargetPropagated = lib.elemAt (lib.elemAt propagatedDependencies 2) 0; - - # This parameter is sometimes a string, sometimes null, and sometimes a list, yuck - configureFlags = let inherit (lib) optional elem; in - (/**/ if lib.isString configureFlags then [configureFlags] - else if configureFlags == null then [] - else configureFlags) - ++ optional (elem "build" configurePlatforms) "--build=${stdenv.buildPlatform.config}" - ++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}" - ++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}"; - - inherit patches; - - inherit doCheck doInstallCheck; - - inherit outputs; - } // lib.optionalAttrs (__contentAddressed) { - inherit __contentAddressed; - # Provide default values for outputHashMode and outputHashAlgo because - # most people won't care about these anyways - outputHashAlgo = attrs.outputHashAlgo or "sha256"; - outputHashMode = attrs.outputHashMode or "recursive"; - } // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { - cmakeFlags = - (/**/ if lib.isString cmakeFlags then [cmakeFlags] - else if cmakeFlags == null then [] - else cmakeFlags) - ++ [ "-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" ( - lib.optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}"] - ++ lib.optional (stdenv.hostPlatform.uname.processor != null) "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}" - ++ lib.optional (stdenv.hostPlatform.uname.release != null) "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.release}" - ++ lib.optional (stdenv.hostPlatform.isDarwin) "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" - ++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}" - ++ lib.optional (stdenv.buildPlatform.uname.processor != null) "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}" - ++ lib.optional (stdenv.buildPlatform.uname.release != null) "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}"; - - mesonFlags = if mesonFlags == null then null else let - # See https://mesonbuild.com/Reference-tables.html#cpu-families - cpuFamily = platform: with platform; - /**/ if isAarch32 then "arm" - else if isAarch64 then "aarch64" - else if isx86_32 then "x86" - else if isx86_64 then "x86_64" - else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits; - crossFile = builtins.toFile "cross-file.conf" '' - [properties] - needs_exe_wrapper = true - - [host_machine] - system = '${stdenv.targetPlatform.parsed.kernel.name}' - cpu_family = '${cpuFamily stdenv.targetPlatform}' - cpu = '${stdenv.targetPlatform.parsed.cpu.name}' - endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} - ''; - in [ "--cross-file=${crossFile}" ] ++ mesonFlags; - } // lib.optionalAttrs (attrs.enableParallelBuilding or false) { - enableParallelChecking = attrs.enableParallelChecking or true; - } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != [] || stdenv.hostPlatform.isMusl) { - NIX_HARDENING_ENABLE = enabledHardeningOptions; - } // lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform ? gcc.arch) { - requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.gcc.arch}" ]; - } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { - inherit __darwinAllowLocalNetworking; - # TODO: remove lib.unique once nix has a list canonicalization primitive - __sandboxProfile = - let profiles = [ stdenv.extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ]; - final = lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.unique profiles)); - in final; - __propagatedSandboxProfile = lib.unique (computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]); - __impureHostDeps = computedImpureHostDeps ++ computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps ++ __impureHostDeps ++ stdenv.__extraImpureHostDeps ++ [ - "/dev/zero" - "/dev/random" - "/dev/urandom" - "/bin/sh" - ]; - __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps; - }; - - validity = checkMeta { inherit meta attrs; }; - - # The meta attribute is passed in the resulting attribute set, - # but it's not part of the actual derivation, i.e., it's not - # passed to the builder and is not a dependency. But since we - # include it in the result, it *is* available to nix-env for queries. - meta = { - # `name` above includes cross-compilation cruft (and is under assert), - # lets have a clean always accessible version here. - name = attrs.name or "${attrs.pname}-${attrs.version}"; - - # If the packager hasn't specified `outputsToInstall`, choose a default, - # which is the name of `p.bin or p.out or p` along with `p.man` when - # present. - # - # If the packager has specified it, it will be overridden below in - # `// meta`. - # - # Note: This default probably shouldn't be globally configurable. - # Services and users should specify outputs explicitly, - # unless they are comfortable with this default. - outputsToInstall = - let - hasOutput = out: builtins.elem out outputs; - in [( lib.findFirst hasOutput null (["bin" "out"] ++ outputs) )] - ++ lib.optional (hasOutput "man") "man"; - } - // attrs.meta or {} - # Fill `meta.position` to identify the source location of the package. - // lib.optionalAttrs (pos != null) { - position = pos.file + ":" + toString pos.line; - } // { - # Expose the result of the checks for everyone to see. - inherit (validity) unfree broken unsupported insecure; - available = validity.valid - && (if config.checkMetaRecursively or false - then lib.all (d: d.meta.available or true) references - else true); - }; - - in - - lib.extendDerivation - validity.handled - ({ - overrideAttrs = f: mkDerivation (attrs // (f attrs)); - - # A derivation that always builds successfully and whose runtime - # dependencies are the original derivations build time dependencies - # This allows easy building and distributing of all derivations - # needed to enter a nix-shell with - # nix-build shell.nix -A inputDerivation - inputDerivation = derivation (derivationArg // { - # Add a name in case the original drv didn't have one - name = derivationArg.name or "inputDerivation"; - # This always only has one output - outputs = [ "out" ]; - - # Propagate the original builder and arguments, since we override - # them and they might contain references to build inputs - _derivation_original_builder = derivationArg.builder; - _derivation_original_args = derivationArg.args; - - builder = stdenv.shell; - # The bash builtin `export` dumps all current environment variables, - # which is where all build input references end up (e.g. $PATH for - # binaries). By writing this to $out, Nix can find and register - # them as runtime dependencies (since Nix greps for store paths - # through $out to find them) - args = [ "-c" "export > $out" ]; - }); - - inherit meta passthru; - } // - # Pass through extra attributes that are not inputs, but - # should be made available to Nix expressions using the - # derivation (e.g., in assertions). - passthru) - (derivation derivationArg); - -} + inherit meta passthru; + } // + # Pass through extra attributes that are not inputs, but + # should be made available to Nix expressions using the + # derivation (e.g., in assertions). + passthru) + (derivation derivationArg) diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh b/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh index 2a1e0cfc6d..ec5a5e6dcb 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh +++ b/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh @@ -975,6 +975,7 @@ configurePhase() { fi if [ -z "${dontFixLibtool:-}" ]; then + export lt_cv_deplibs_check_method="${lt_cv_deplibs_check_method-pass_all}" local i find . -iname "ltmain.sh" -print0 | while IFS='' read -r -d '' i; do echo "fixing libtool script $i" diff --git a/third_party/nixpkgs/pkgs/tools/X11/xrestop/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xrestop/default.nix index e2b87e7380..dd3766160c 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xrestop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xrestop/default.nix @@ -1,19 +1,22 @@ { lib, stdenv, fetchurl, xorg, pkg-config, ncurses }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xrestop"; - version = "0.4"; + version = "0.5"; src = fetchurl { - url = "mirror://gentoo/distfiles/xrestop-0.4.tar.gz"; - sha256 = "0mz27jpij8am1s32i63mdm58znfijcpfhdqq1npbmvgclyagrhk7"; + url = "https://xorg.freedesktop.org/archive/individual/app/xrestop-${version}.tar.bz2"; + sha256 = "06ym32famav8qhdms5k7y5i14nfq89hhvfn5g452jjqzkpcsbl49"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 xorg.libXres xorg.libXext ncurses ]; - meta = { - platforms = lib.platforms.unix; - license = lib.licenses.gpl2; + meta = with lib; { + description = "A 'top' like tool for monitoring X Client server resource usage"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xrestop"; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.unix; + license = licenses.gpl2Plus; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix index 762eab4eb0..0c5d08fd25 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix @@ -3,13 +3,14 @@ let py = python3.override { packageOverrides = self: super: { botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0dev122"; + version = "2.0.0dev138"; src = fetchFromGitHub { owner = "boto"; repo = "botocore"; - rev = "8dd916418c8193f56226b7772f263b2435eae27a"; - sha256 = "sha256-iAZmqnffqrmFuxlQyOpEQzSCcL/hRAjuXKulOXoy4hY="; + rev = "5f1971d2d9d2cf7090a8b71650ab40712319bca3"; + sha256 = "sha256-onptN++MDJrit3sIEXCX9oRJ0qQ5xzmI6J2iABiK7RA"; }; + propagatedBuildInputs = super.botocore.propagatedBuildInputs ++ [py.pkgs.awscrt]; }); prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec { version = "2.0.10"; @@ -24,13 +25,13 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.2.14"; # N.B: if you change this, change botocore to a matching version too + version = "2.2.30"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-LU9Tqzdi8ULZ5y3FbfSXdrip4NcxFkXRCTpVGo05LcM="; + sha256 = "sha256-OPxo5RjdDCTPntiJInUtgcU43Nn5JEUbwRJXeBl/yYQ"; }; patches = [ @@ -42,7 +43,7 @@ with py.pkgs; buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "awscrt==0.11.13" "awscrt" \ + --replace "awscrt==0.11.24" "awscrt" \ --replace "colorama>=0.2.5,<0.4.4" "colorama" \ --replace "cryptography>=3.3.2,<3.4.0" "cryptography" \ --replace "docutils>=0.10,<0.16" "docutils" \ diff --git a/third_party/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix b/third_party/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix index 0daa65cc98..be4bef1e16 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "7.4"; - versionMinor = "1"; - versionBuild_x86_64 = "1"; + versionMajor = "7.6"; + versionMinor = "2"; + versionBuild_x86_64 = "4"; versionBuild_i686 = "1"; in stdenv.mkDerivation rec { @@ -14,12 +14,12 @@ in if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"; - sha256 = "1qir9ii0h5ali87mjzjl72dm1ky626d7y59jfpglakqxzqhjamdz"; + sha256 = "1kkdf9dlp4j453blnwp1sds4r3h3fy863pvhdh466mrq3f10qca8"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; - sha256 = "1gxiysc09k3jz1pkkyfqgw2fygcnmrnskk6b9vn4fjnvsab4py60"; + sha256 = "0h4c90hzhbg0qdb585bc9gry9cf9hd8r53m2jha4fdqhzd95ydln"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; @@ -90,4 +90,3 @@ in platforms = [ "x86_64-linux" "i686-linux" ]; }; } - diff --git a/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix b/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix index 0620bb2853..cd4abc51bc 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix @@ -7,11 +7,11 @@ }: python3.pkgs.buildPythonApplication rec { pname = "salt"; - version = "3003.1"; + version = "3003.2"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "inGE095NFydhjw0/u6eeVDia7/hbcvTOuCALzBZ/br4="; + sha256 = "c8hsRLF22M/cAzux5C5P3I3TQkgz+qLqDQk4+hc4Vqk="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/admin/sec/default.nix b/third_party/nixpkgs/pkgs/tools/admin/sec/default.nix index 0afac976d0..11a18dc199 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/sec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/sec/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sec"; - version = "2.8.3"; + version = "2.9.0"; src = fetchFromGitHub { owner = "simple-evcorr"; repo = "sec"; rev = version; - sha256 = "0ryic5ilj1i5l41440i0ss6j3yv796fz3gr0qij5pqyd1z21md83"; + sha256 = "sha256-WYSlIRhDBIDaza92VqCQcdMNicuRUX2IKY5CJyhswdI="; }; buildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix index 50ca76f0d6..c3b90d99ba 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix @@ -15,9 +15,9 @@ buildGoModule rec { excludedPackages = "misc"; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version}") - ''; + ldflags = [ + "-s" "-w" "-X main.version=v${version}" + ]; doInstallCheck = true; installCheckPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix index 059174ae0a..94f97e29af 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix @@ -100,18 +100,13 @@ let in pythonPackages.buildPythonApplication rec { pname = "beets"; - # While there is a stable version, 1.4.9, it is more than 1000 commits behind - # master and lacks many bug fixes and improvements[1]. Also important, - # unstable does not require bs1770gain[2]. - # [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639 - # [2]: https://github.com/NixOS/nixpkgs/pull/90504 - version = "unstable-2021-05-13"; + version = "1.5.0"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "1faa41f8c558d3f4415e5e48cf4513d50b466d34"; - sha256 = "sha256-P0bV7WNqCYe9+3lqnFmAoRlb2asdsBUjzRMc24RngpU="; + rev = "v${version}"; + sha256 = "sha256-yQMCJUwpjDDhPffBS6LUq6z4iT1VyFQE0R27XEbYXbY="; }; propagatedBuildInputs = [ @@ -266,7 +261,6 @@ in pythonPackages.buildPythonApplication rec { passthru = { # FIXME: remove in favor of pkgs.beetsExternalPlugins externalPlugins = beetsExternalPlugins; - updateScript = unstableGitUpdater { url = "https://github.com/beetbox/beets"; }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix b/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix index cbe35765cb..ac5767b242 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, multiStdenv , fetchFromGitHub , substituteAll , meson @@ -8,6 +8,7 @@ , wine , boost , libxcb +, pkgsi686Linux }: let @@ -55,16 +56,16 @@ let sha256 = "sha256-39pvfcg4fvf7DAbAPzEHA1ja1LFL6r88nEwNYwaDC8w="; }; }; -in stdenv.mkDerivation rec { +in multiStdenv.mkDerivation rec { pname = "yabridge"; - version = "3.3.1"; + version = "3.5.2"; # NOTE: Also update yabridgectl's cargoHash when this is updated src = fetchFromGitHub { owner = "robbert-vdh"; repo = pname; rev = version; - hash = "sha256-3B+6YuCWVJljqdyGpePjPf5JDwLSWFNgOCeLt8e4mO8="; + hash = "sha256-SLiksc8lQo2A5sefKbcaJyhi8vPdp2p2Jbc7bvM0sDw="; }; # Unpack subproject sources @@ -109,6 +110,7 @@ in stdenv.mkDerivation rec { mesonFlags = [ "--cross-file" "cross-wine.conf" + "-Dwith-bitbridge=true" # Requires CMake and is unnecessary "-Dtomlplusplus:GENERATE_CMAKE_CONFIG=disabled" @@ -118,11 +120,16 @@ in stdenv.mkDerivation rec { "-Dtomlplusplus:BUILD_TESTS=disabled" ]; + preConfigure = '' + sed -i "214s|xcb.*|xcb_32bit_dep = winegcc.find_library('xcb', dirs: [ '${lib.getLib pkgsi686Linux.xorg.libxcb}/lib', ])|" meson.build + sed -i "192 i '${lib.getLib pkgsi686Linux.boost}/lib'," meson.build + ''; + installPhase = '' runHook preInstall mkdir -p "$out/bin" "$out/lib" - cp yabridge-group.exe{,.so} "$out/bin" - cp yabridge-host.exe{,.so} "$out/bin" + cp yabridge-group*.exe{,.so} "$out/bin" + cp yabridge-host*.exe{,.so} "$out/bin" cp libyabridge-vst2.so "$out/lib" cp libyabridge-vst3.so "$out/lib" runHook postInstall diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridge/hardcode-wine.patch b/third_party/nixpkgs/pkgs/tools/audio/yabridge/hardcode-wine.patch index 2b6ce1f448..d58aedeb27 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridge/hardcode-wine.patch +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridge/hardcode-wine.patch @@ -1,13 +1,13 @@ diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp -index 1ff05bc..0723456 100644 +index 7fb7d1b3..eb227101 100644 --- a/src/plugin/utils.cpp +++ b/src/plugin/utils.cpp -@@ -351,7 +351,7 @@ std::string get_wine_version() { +@@ -105,5 +105,5 @@ std::string PluginInfo::wine_version() const { access(wineloader_path.c_str(), X_OK) == 0) { wine_path = wineloader_path; } else { - wine_path = bp::search_path("wine").string(); + wine_path = "@wine@/bin/wine"; } - + bp::ipstream output; diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix index bf0913372b..35c8b0c5ae 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = yabridge.src; sourceRoot = "source/tools/yabridgectl"; - cargoHash = "sha256-f5k5OF+bEzH0b6M14Mdp8t4Qd5dP5Qj2fDsdiG1MkYk="; + cargoHash = "sha256-2x3qB0LbCBUZ4zqKIXPtYdWis+4QANTaJdFvoFbccGE="; patches = [ # By default, yabridgectl locates libyabridge.so by using diff --git a/third_party/nixpkgs/pkgs/tools/backup/wal-g/default.nix b/third_party/nixpkgs/pkgs/tools/backup/wal-g/default.nix index e184810a29..80f3b6bbf8 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/wal-g/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/wal-g/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wal-g"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "wal-g"; repo = "wal-g"; rev = "v${version}"; - sha256 = "0al8xg57fh3zqwgmm6lkcnpnisividhqld9jry3sqk2k45856y8j"; + sha256 = "1hiym5id310rvw7vr8wir2vpf0p5qz71rx6v5i2gpjqml7c97cls"; }; - vendorSha256 = "0n0ymgcgkjlp0indih8h55jjj6372rdfcq717kwln6sxm4r9mb17"; + vendorSha256 = "09z9x20zna1czhfpl47i98r8163a266mnr6xi17npjsfdvsjkppn"; buildInputs = [ brotli libsodium ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix index e07ca270b5..dc1d77bfa7 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "/usr/local/lib/pkgconfig" "/nonexistent" ''; - preBuild = lib.optional stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.isDarwin '' substituteInPlace config.h --replace \ "#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1" \ "#undef HAVE_STRUCT_STAT_ST_BIRTHTIME" diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index cb4f3820bc..1dbaee5ad1 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "0hlrbiy8xmccczi11ml0lzmg3946l9ck5wpfyw03wn5zgvx29zja"; + sha256 = "sha256-q84Pz5qK4cM1Lk5eh+Gwd/VEEdpRczLqg7XnzpSN1w0="; }; nativeBuildInputs = [ doxygen graphviz pkg-config perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix new file mode 100644 index 0000000000..bd173e7e57 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "tar2ext4"; + version = "0.8.20"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "hcsshim"; + rev = "v${version}"; + sha256 = "sha256-X7JsUFL9NkNT7ihE5olrqMUP8RnoVC10KLrQeT/OU3o="; + }; + + sourceRoot = "source/cmd/tar2ext4"; + vendorSha256 = null; + + meta = with lib; { + description = "Convert a tar archive to an ext4 image"; + maintainers = with maintainers; [ qyliss ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix index b78cafe566..7aaf28764d 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "2.1.0-dev-20210809"; + version = "2.1.0-dev-20210820"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-n1a35syStFbhpVGyi/7oxWzBb2lXyVZd3K8/Bt8b0Lg="; + sha256 = "sha256-XsjWrih+8D3z1I41N5ZoLar/+5FV9mPN9aMbyZK2m/0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/svgbob/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/svgbob/default.nix index 1f72243293..389f6415e9 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/svgbob/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/svgbob/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "svgbob"; - version = "0.5.3"; + version = "0.5.4"; src = fetchCrate { inherit version; crateName = "svgbob_cli"; - sha256 = "1gi8h4wzpi477y1gwi4708pn2kr65934a4dmphbhwppxbw447qiw"; + sha256 = "0qq7hkg32bqyw3vz3ibip7yrjg5m2ch9kdnwqrzaqqy9wb8d7154"; }; - cargoSha256 = "1x8phpllwm12igaachghwq6wgxl7nl8bhh7xybfrmn447viwxhq2"; + cargoSha256 = "0p37qkgh1xpqmkr2p88njwhifpyqfh27qcwmmhwxdqcpzmmmkjhr"; meta = with lib; { description = "Convert your ascii diagram scribbles into happy little SVG"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/xcolor/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/xcolor/default.nix index 1e8f3fd78d..95f21efe1a 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/xcolor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/xcolor/default.nix @@ -1,29 +1,42 @@ -{ lib, rustPlatform, fetchFromGitHub, fetchpatch, pkg-config, libX11, libXcursor, libxcb, python3 }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, libX11, libXcursor +, libxcb, python3, installShellFiles, makeDesktopItem, copyDesktopItems }: rustPlatform.buildRustPackage rec { pname = "xcolor"; - version = "unstable-2021-02-02"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Soft"; repo = pname; - rev = "0e99e67cd37000bf563aa1e89faae796ec25f163"; - sha256 = "sha256-rHqK05dN5lrvDNbRCWGghI7KJwWzNCuRDEThEeMzmio="; + rev = version; + sha256 = "0i04jwvjasrypnsfwdnvsvcygp8ckf1a5sxvjxaivy73cdvy34vk"; }; - cargoPatches = [ - # Update Cargo.lock, lexical_core doesn't build on Rust 1.52.1 - (fetchpatch { - url = "https://github.com/Soft/xcolor/commit/324d80a18a39a11f2f7141b226f492e2a862d2ce.patch"; - sha256 = "sha256-5VzXitpl/gMef40UQBh1EoHezXPyB08aflqp0mSMAVI="; + cargoSha256 = "1r2s4iy5ls0svw5ww51m37jhrbvnj690ig6n9c60hzw1hl4krk30"; + + nativeBuildInputs = [ pkg-config python3 installShellFiles copyDesktopItems ]; + + buildInputs = [ libX11 libXcursor libxcb ]; + + desktopItems = [ + (makeDesktopItem { + name = "XColor"; + exec = "xcolor -s"; + desktopName = "XColor"; + comment = "Select colors visible anywhere on the screen to get their RGB representation"; + icon = "xcolor"; + categories = "Graphics;"; }) ]; - cargoSha256 = "sha256-yD4pX+dCJvbDecsdB8tNt1VsEcyAJxNrB5WsZUhPGII="; + postInstall = '' + mkdir -p $out/share/applications - nativeBuildInputs = [ pkg-config python3 ]; - - buildInputs = [ libX11 libXcursor libxcb ]; + installManPage man/xcolor.1 + for x in 16 24 32 48 256 512; do + install -D -m644 extra/icons/xcolor-''${x}.png $out/share/icons/hicolor/''${x}x''${x}/apps/xcolor.png + done + ''; meta = with lib; { description = "Lightweight color picker for X11"; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/emote/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/emote/default.nix new file mode 100644 index 0000000000..d65831d520 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/emote/default.nix @@ -0,0 +1,56 @@ +{ lib, fetchFromGitHub, python3Packages, wrapGAppsHook, gobject-introspection, gtk3, keybinder3, xdotool, pango, gdk-pixbuf, atk, librsvg }: + +python3Packages.buildPythonApplication rec { + pname = "emote"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "tom-james-watson"; + repo = "Emote"; + rev = "v${version}"; + sha256 = "kYXFD6VBnuEZ0ZMsF6ZmN4V0JN83puxRILpNlllVsKQ="; + }; + + postPatch = '' + substituteInPlace setup.py --replace "pygobject==3.36.0" "pygobject" + substituteInPlace emote/config.py --replace 'os.environ.get("SNAP")' "'$out/share/emote'" + substituteInPlace snap/gui/emote.desktop --replace "Icon=\''${SNAP}/usr/share/icons/emote.svg" "Icon=emote.svg" + ''; + + nativeBuildInputs = [ + wrapGAppsHook + gobject-introspection + keybinder3 + pango + gdk-pixbuf + atk + ]; + + propagatedBuildInputs = [ + python3Packages.pygobject3 + gtk3 + xdotool + librsvg + ]; + + postInstall = '' + install -D snap/gui/emote.desktop $out/share/applications/emote.desktop + install -D snap/gui/emote.svg $out/share/pixmaps/emote.svg + install -D -t $out/share/emote/static static/{emojis.json,logo.svg,style.css} + ''; + + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + doCheck = false; + + meta = with lib; { + description = "A modern emoji picker for Linux"; + homepage = "https://github.com/tom-james-watson/emote"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ angustrau ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index 069343b8a4..5c30b40f22 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -3,23 +3,31 @@ , e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R , radare2, sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd +, fetchpatch , enableBloat ? false }: # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "180"; + version = "181"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-P6u+5MwnJ4xQ955qdX1I/ujRCcgyCXjXDXvvpUbhqt8="; + sha256 = "sha256-wom3/r0oR7K8zdz1GxLImQ4Whc4WpzPGwjqXb39mxw4="; }; outputs = [ "out" "man" ]; patches = [ ./ignore_links.patch + + # Fixes a minor issue with squashfs >=4.5 (which we already have). Already + # in upstream's master, can be removed when updating to 182. + (fetchpatch { + url = "https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/9e410d6fd4def177c4b5f914e74f72a59fb1a316.patch"; + sha256 = "sha256-Nj5Up48lfekH8KCPaucDb78QbtJ91O2SNiA4SqBrCBI="; + }) ]; postPatch = '' @@ -38,7 +46,7 @@ python3Packages.buildPythonApplication rec { # Still missing these tools: docx2txt dumpimage dumppdf dumpxsb enjarify lipo ocamlobjinfo oggDump otool procyon pythonPath = [ binutils-unwrapped bzip2 colordiff coreutils cpio db diffutils - dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip + e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip libarchive libcaca lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd xz zip zstd ] @@ -46,7 +54,7 @@ python3Packages.buildPythonApplication rec { argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c python_magic progressbar33 pypdf2 rpm tlsh ]) - ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit ] + ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ] ++ lib.optionals enableBloat ([ abootimg apksigner apktool cbfstool colord ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt radare2 @@ -70,6 +78,19 @@ python3Packages.buildPythonApplication rec { # Failing because of file-v5.40 has a slightly different output. # Upstream issue: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/271 "test_text_proper_indentation" + ] ++ lib.optionals stdenv.isDarwin [ + # Disable flaky tests on Darwin + "test_non_unicode_filename" + "test_listing" + ]; + + # flaky tests on Darwin + disabledTestPaths = lib.optionals stdenv.isDarwin [ + "tests/comparators/test_git.py" + "tests/comparators/test_java.py" + "tests/comparators/test_uimage.py" + "tests/comparators/test_device.py" + "tests/comparators/test_macho.py" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix index 238bd9c4b0..13e60072ad 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix @@ -1,22 +1,22 @@ -{ stdenv -, lib -, fetchFromGitHub }: +{ stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "disfetch"; - version = "2.12"; + version = "2.13"; src = fetchFromGitHub { owner = "q60"; repo = "disfetch"; rev = version; - sha256 = "sha256-+6U5BdLmdTaFzgZmjSH7rIL9JTwIX7bFkQqm0rNuTRY="; + sha256 = "sha256-+0WWhf7VYqPWgt1IwKQ74HLCLfhXsstA7Eh9VU/BKhg="; }; dontBuild = true; installPhase = '' + runHook preInstall install -Dm755 -t $out/bin disfetch + runHook postInstall ''; meta = with lib; { @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/q60/disfetch"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.vel ]; + maintainers = with maintainers; [ vel ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/envdir-go/default.nix b/third_party/nixpkgs/pkgs/tools/misc/envdir-go/default.nix index eafc71030a..8f847df3d5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/envdir-go/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/envdir-go/default.nix @@ -14,10 +14,10 @@ buildGoPackage rec { sha256 = "1wdlblj127skgynf9amk7waabc3abbyxys9dvyc6c72zpcpdy5nc"; }; - preBuild = '' - # TODO: is there a way to get the commit ref so we can set main.buildCommit? - buildFlagsArray+=("-ldflags" "-X main.buildDate=1970-01-01T00:00:00+0000 -X main.buildVersion=${version}") -''; + # TODO: is there a way to get the commit ref so we can set main.buildCommit? + ldflags = [ + "-X main.buildDate=1970-01-01T00:00:00+0000" "-X main.buildVersion=${version}" + ]; meta = { description = "A go rewrite of envdir"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix index feeb7ad758..112841c026 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -16,13 +16,13 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "1.20.4"; + version = "2021.8.0"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "sha256-Z2/7J8F9o+ZY+7Q9bpAT79yHqUFyJu9usu4XI4PhpCI="; + rev = version; + sha256 = "sha256-yVqma5WRQTt5Vq7poqHexASc59xthYaNcz/kkefC7qI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/ethtool/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ethtool/default.nix index 4b6d7cc933..9457507458 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ethtool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ethtool/default.nix @@ -1,14 +1,17 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { pname = "ethtool"; - version = "5.4"; + version = "5.13"; src = fetchurl { url = "mirror://kernel/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0srbqp4a3x9ryrbm5q854375y04ni8j0bmsrl89nmsyn4x4ixy12"; + sha256 = "1wwcwiav0fbl75axmx8wms4xfdp1ji5c7j49k4yl8bngqra74fp6"; }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libmnl ]; + meta = with lib; { description = "Utility for controlling network drivers and hardware"; homepage = "https://www.kernel.org/pub/software/network/ethtool/"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/goss/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goss/default.nix index bbe947ecd1..c4396bfae9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/goss/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/goss/default.nix @@ -14,9 +14,9 @@ buildGoModule rec { vendorSha256 = "1lyqjkwj8hybj5swyrv6357hs8sxmf4wim0c8yhfb9mv7fsxhrv7"; CGO_ENABLED = 0; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version}") - ''; + ldflags = [ + "-s" "-w" "-X main.version=v${version}" + ]; meta = with lib; { homepage = "https://github.com/aelsabbahy/goss/"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lua-format/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lua-format/default.nix deleted file mode 100644 index 9aad25ce72..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/lua-format/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ 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/macchina/default.nix b/third_party/nixpkgs/pkgs/tools/misc/macchina/default.nix index 053240e211..8b4b897526 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/macchina/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/macchina/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "macchina"; - version = "0.9.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; rev = "v${version}"; - sha256 = "sha256:0d6nqjn2828kk91430yjl6xlwx1j10xhp2i0vv2slm3wv0a4w24x"; + sha256 = "sha256-ZuQ0FZM77ENAQ57B0oFqFmGqQnFblCP2wJETb47yo1E="; }; - cargoSha256 = "sha256:0mjqqd43jj6hxicgjkvmdf966vj5xf0ndibszzwp38zdb5kzshqi"; + cargoSha256 = "sha256-YwhhOHiQcN8VS1DFTtZGvD2QvNAfPngPm/ZeOxzuDnw="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix b/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix index 9bfc7e259d..c964a8872f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix @@ -16,9 +16,9 @@ buildGoPackage rec { goPackagePath = "github.com/variadico/noti"; - preBuild = '' - buildFlagsArray+=("-ldflags" "-X ${goPackagePath}/internal/command.Version=${version}") - ''; + ldflags = [ + "-X ${goPackagePath}/internal/command.Version=${version}" + ]; postInstall = '' install -Dm444 -t $out/share/man/man1 $src/docs/man/*.1 diff --git a/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix index e1fed81b2d..c5ca7e8c91 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pgcenter"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "lesovsky"; repo = "pgcenter"; rev = "v${version}"; - sha256 = "18s102hv6qqlx0nra91srdlb5fyv6x3hwism6c2r6zbxh68pgsag"; + sha256 = "sha256-xaY01T12/5Peww9scRgfc5yHj7QA8BEwOK5l6OedziY="; }; - vendorSha256 = "0mgq9zl56wlr37dxxa1sh53wfkhrl9ybjvxj5y9djspqkp4j45pn"; + vendorSha256 = "sha256-9hYiyZ34atmSL7JvuXyiGU7HR4E6qN7bGZlyU+hP+FU="; subPackages = [ "cmd" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix index 54e7093747..955444ff8c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.10.5"; + version = "1.11.0"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rqaK94Rw0K1+r7+7jHI2bzBupCGTkokeC4heJ3Yu6pQ="; + sha256 = "sha256-8E4rciuoZrj8Oz2EXqtFgrPxvb8GJO3n1s2FpXrR0Q0="; }; - vendorSha256 = "sha256-5f2hkOgAE4TrHNz7xx1RU9fozxjFZAl4HilhAqsbo5s="; + vendorSha256 = "sha256-scaaRjaDE/RG6Ei83CJBkfQCd1e5pH/Cs2vEbdl9Oyg="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix index 270a9ef864..304649a86b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2021.7"; + version = "1.2021.9"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "sha256-2hQIwUpkxLHGG+kx8AekSKJ1qO8inL8xnko0dlLC1Kg="; + sha256 = "sha256-ezyQGrJwMl2Tqv14GSQzApdDqg1RV8OWdnp4K8a1A5k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/silicon/default.nix b/third_party/nixpkgs/pkgs/tools/misc/silicon/default.nix index 40586f6be6..ccef6ee293 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/silicon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/silicon/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "silicon"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "silicon"; rev = "v${version}"; - sha256 = "sha256-k+p8AEEL1BBJTmPc58QoIk7EOzu8QKdG00RQ58EN3bg="; + sha256 = "sha256-yhs9BEMMFUtptd0cLsaUW02QZVhztvn8cB0nUqPnO+Y="; }; - cargoSha256 = "sha256-vpegobS7lpRkt/oZePW9WggYeg0JXDte8fQP/bf7oAI="; + cargoSha256 = "sha256-tj5HPE9EGC7JQ3dyeMPPI0/3r/idrShqfbpnVuaEtDk="; buildInputs = [ llvmPackages.libclang expat freetype fira-code ] ++ lib.optionals stdenv.isLinux [ libxcb ] diff --git a/third_party/nixpkgs/pkgs/tools/misc/traefik-certs-dumper/default.nix b/third_party/nixpkgs/pkgs/tools/misc/traefik-certs-dumper/default.nix new file mode 100644 index 0000000000..fc0062185b --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/traefik-certs-dumper/default.nix @@ -0,0 +1,23 @@ +{ fetchFromGitHub, buildGoModule, lib }: + +buildGoModule rec { + pname = "traefik-certs-dumper"; + version = "2.7.4"; + + src = fetchFromGitHub { + owner = "ldez"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-exkBDrNGvpOz/VD6yfE1PKL4hzs/oZ+RxMwm/ytuV/0="; + }; + + vendorSha256 = "sha256-NmYfdX5BKHZvFzlkh/kkK0voOzNj1EPn53Mz/B7eLd0="; + excludedPackages = "integrationtest"; + + meta = with lib; { + description = "dump ACME data from traefik to certificates"; + homepage = "https://github.com/ldez/traefik-certs-dumper"; + license = licenses.asl20; + maintainers = with maintainers; [ nickcao ]; + }; +} 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 8bd618d5a9..dd2115f99b 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.1536"; + version = "0.4.1545"; # 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 = "78c9a113950344e06d18940bd11fe9a2f78b9d0bc8963cde300017ac1ffcef09"; + sha256 = "63e9b0527424c565303fe3d8ede1cd35d48a4ecf4afe72e1c12b0e90b9fdcd39"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/networking/aria2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/aria2/default.nix index 7e4f06302f..db239e034f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/aria2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/aria2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "aria2"; - version = "1.35.0"; + version = "1.36.0"; src = fetchFromGitHub { owner = "aria2"; repo = "aria2"; rev = "release-${version}"; - sha256 = "195r3711ly3drf9jkygwdc2m7q99hiqlfrig3ip1127b837gzsf9"; + sha256 = "sha256-ErjFfSJDIgZq0qy0Zn5uZ9bZS2AtJq4FuBVuUuQgPTI="; }; nativeBuildInputs = [ pkg-config autoreconfHook sphinx ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix index 7d3c662b36..5bbedf0f7e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix @@ -20,9 +20,9 @@ buildGoModule rec { doCheck = false; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X moul.io/assh/v2/pkg/version.Version=${version}") - ''; + ldflags = [ + "-s" "-w" "-X moul.io/assh/v2/pkg/version.Version=${version}" + ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/bgpq4/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bgpq4/default.nix index 40c65b35a0..bfbb138952 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/bgpq4/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/bgpq4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bgpq4"; - version = "0.0.7"; + version = "1.2"; src = fetchFromGitHub { owner = "bgp"; repo = pname; rev = version; - sha256 = "sha256-iEm4BYlJi56Y4OBCdEDgRQ162F65PLZyvHSEQzULFww="; + sha256 = "sha256-8r70tetbTq8GxxtFe71gDYy+wg8yBwYpl1gsu5aAHTA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix b/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix index 925587ae93..7b96bcb05c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.5.0"; + version = "0.5.1"; src = let @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { x86_64-darwin = "darwin_amd64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-5ggbM6Ev4TkpyG0yPGCh22QSqefyO32Q2k2kthHgkTc="; - aarch64-linux = "sha256-oboMI2OxemIEX+IcBkN/DoACGXzyxsxHg4OD3ugbLR0="; - x86_64-darwin = "sha256-dpSI7I37vChljHSV0mwUDymngIFoQ5sWAszJ9MePMG8="; + x86_64-linux = "sha256-+e4wo2vYSE3Z0icHcOu9aW6ZR6EDKiTe+S58d9s/1m4="; + aarch64-linux = "sha256-WR9SmUO/fHivUAAYpbXujQC0zjUmG8ATiTqGVZHly1s="; + x86_64-darwin = "sha256-Ih2uO4s0rukGDC8DhamaFb0HT4OKiBtQovRTD3rL9XY="; }; in fetchzip { diff --git a/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix index cc1bad106f..0962335ad1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { installFlags = [ "DBDIR=$(TMPDIR)/db" "SYSCONFDIR=${placeholder "out"}/etc" ]; # Check that the udev plugin got built. - postInstall = lib.optional (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; + postInstall = lib.optionalString (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; meta = with lib; { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/iperf/2.nix b/third_party/nixpkgs/pkgs/tools/networking/iperf/2.nix index 3270a25e67..82c1ba34f1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/iperf/2.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/iperf/2.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "iperf-2.0.13"; + pname = "iperf"; + version = "2.1.4"; src = fetchurl { - url = "mirror://sourceforge/iperf2/files/${name}.tar.gz"; - sha256 = "1bbq6xr0vrd88zssfiadvw3awyn236yv94fsdl9q2sh9cv4xx2n8"; + url = "mirror://sourceforge/iperf2/files/${pname}-${version}.tar.gz"; + sha256 = "1yflnj2ni988nm0p158q8lnkiq2gn2chmvsglyn2gqmqhwp3jaq6"; }; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ipinfo/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ipinfo/default.nix index 926e46bf22..9a48588d3d 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.2"; + version = "2.1.1"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = "${pname}-${version}"; - sha256 = "05448p3bp01l5wyhl94023ywxxkmanm4gp4sdz1b71xicy2fnsmz"; + sha256 = "15pwx94n4qi02r3ppqkpnkikpnbqmr8rrn9gmkbjy2vbdi147qwl"; }; 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 468bc12722..694c1f5e72 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.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "hmP2bcoBWMd2GZBE8XtJ5QePpWnkJV5pu69aDmL5V4g="; + sha256 = "rRBi6bgxkVQ94wLBqVQikIE0jVkvm1fjtEzFMsQTJz8="; }; postPatch = lib.optionalString (batchSize != null) '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix index 94d9dff1f8..63c52a3371 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix @@ -54,11 +54,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.32.4"; + version = "1.32.6"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-Kay9QceLfvh/+I/sU2DR6vi1tvy5BVXXORq8XjaSMVg="; + sha256 = "sha256-PSdGBR87MylArCk1TgFpEVnUZ4PXL9IyvTbpgijOWgk="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ofono/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ofono/default.nix index 93e1415b91..c1d6b76154 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ofono/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ofono/default.nix @@ -46,6 +46,10 @@ stdenv.mkDerivation rec { "--enable-external-ell" ]; + installFlags = [ + "SYSCONFDIR=${placeholder "out"}/etc" + ]; + postInstall = '' rm -r $out/etc/ofono ln -s /etc/ofono $out/etc/ofono diff --git a/third_party/nixpkgs/pkgs/tools/networking/rdrview/default.nix b/third_party/nixpkgs/pkgs/tools/networking/rdrview/default.nix index 8f51039570..24ba1d35e9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/rdrview/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/rdrview/default.nix @@ -1,22 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, libxml2, curl, libseccomp }: +{ lib, stdenv, fetchFromGitHub, libxml2, curl, libseccomp, installShellFiles }: stdenv.mkDerivation { - name = "rdrview"; - version = "unstable-2020-12-22"; + pname = "rdrview"; + version = "unstable-2021-05-30"; src = fetchFromGitHub { owner = "eafer"; repo = "rdrview"; - rev = "7be01fb36a6ab3311a9ad1c8c2c75bf5c1345d93"; - sha256 = "00hnvrrrkyp5429rzcvabq2z00lp1l8wsqxw4h7qsdms707mjnxs"; + rev = "444ce3d6efd8989cd6ecfdc0560071b20e622636"; + sha256 = "02VC8r8PdcAfMYB0/NtbPnhsWatpLQc4mW4TmSE1+zk="; }; buildInputs = [ libxml2 curl libseccomp ]; + nativeBuildInputs = [ installShellFiles ]; installPhase = '' + runHook preInstall install -Dm755 rdrview -t $out/bin + installManPage rdrview.1 + runHook postInstall ''; + enableParallelBuilding = true; + meta = with lib; { description = "Command line tool to extract main content from a webpage"; homepage = "https://github.com/eafer/rdrview"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/stunnel/default.nix b/third_party/nixpkgs/pkgs/tools/networking/stunnel/default.nix index befc1c3c3e..68c2fc935f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/stunnel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "stunnel"; - version = "5.59"; + version = "5.60"; src = fetchurl { url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-E3d232vo8XAfHNWQt3eZMuEjR5+5HlGSFxwWeYgVzp8="; + sha256 = "sha256-xF12WxUhhh/qmwO0JbndfUizBVEowK7Gc7ul75uPeH0="; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix b/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix index a0c774fb73..2e31fadba3 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix @@ -59,6 +59,13 @@ stdenv.mkDerivation rec { "--with-libnghttp2=${libnghttp2.dev}" ]; + # Remove references to compile-time dependencies that are included in the configure flags + postConfigure = let + inherit (builtins) storeDir; + in '' + sed -E '/CONFCMDLINE/ s;${storeDir}/[a-z0-9]{32}-;${storeDir}/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-;g' -i config.h + ''; + installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/apg/default.nix b/third_party/nixpkgs/pkgs/tools/security/apg/default.nix index a185c09bda..cfcadd7574 100644 --- a/third_party/nixpkgs/pkgs/tools/security/apg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/apg/default.nix @@ -1,8 +1,10 @@ { lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "apg-2.3.0b"; + pname = "apg"; + version = "2.3.0b"; + src = fetchurl { - url = "http://www.adel.nursat.kz/apg/download/${name}.tar.gz"; + url = "http://www.adel.nursat.kz/apg/download/apg-${version}.tar.gz"; sha256 = "14lbq81xrcsmpk1b9qmqyz7n6ypf08zcxvcvp6f7ybcyf0lj1rfi"; }; configurePhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix b/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix index 9d2adfd9a7..cdd50aaa80 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "bettercap"; - version = "2.31.1"; + version = "2.32.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-vZajnKjuIFoNnjxSsFkkpxyCR27VWqVN4lGf9SadmPU="; + sha256 = "sha256-OND8WPqU/95rKykqMAPWmDsJ+AjsjGjrncZ2/m3mpt0="; }; - vendorSha256 = "sha256-et6D+M+xJbxIiDP7JRRABZ8UqUCpt9ZVI5DP45tyTGM="; + vendorSha256 = "sha256-QKv8F9QLRi+1Bqj9KywJsTErjs7o6gFM4tJLA8y52MY="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/ccrypt/default.nix b/third_party/nixpkgs/pkgs/tools/security/ccrypt/default.nix index bf5f26f704..2972fc9ae5 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ccrypt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ccrypt/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, perl}: -stdenv.mkDerivation { - name = "ccrypt-1.11"; +stdenv.mkDerivation rec { + pname = "ccrypt"; + version = "1.11"; src = fetchurl { - url = "mirror://sourceforge/ccrypt/ccrypt-1.11.tar.gz"; + url = "mirror://sourceforge/ccrypt/ccrypt-${version}.tar.gz"; sha256 = "0kx4a5mhmp73ljknl2lcccmw9z3f5y8lqw0ghaymzvln1984g75i"; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/chaps/default.nix b/third_party/nixpkgs/pkgs/tools/security/chaps/default.nix index 2f89c3ea58..13ac6d67fe 100644 --- a/third_party/nixpkgs/pkgs/tools/security/chaps/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/chaps/default.nix @@ -23,7 +23,7 @@ let in stdenv.mkDerivation rec { - name = "chaps-0.42-6812"; + pname = "chaps"; version = "0.42-6812"; src = fetchFromGitHub { @@ -59,25 +59,25 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp ${name}/out/chapsd $out/bin/. - cp ${name}/out/chaps_client $out/bin/. + cp ${pname}-${version}/out/chapsd $out/bin/. + cp ${pname}-${version}/out/chaps_client $out/bin/. mkdir -p $out/lib - cp ${name}/out/libchaps.so.* $out/lib/. + cp ${pname}-${version}/out/libchaps.so.* $out/lib/. mkdir -p $out/lib/security - cp ${name}/out/pam_chaps.so $out/lib/security/. + cp ${pname}-${version}/out/pam_chaps.so $out/lib/security/. mkdir -p $out/include - cp -r ${name}/out/chaps $out/include/. + cp -r ${pname}-${version}/out/chaps $out/include/. mkdir -p $out/etc/dbus-1/system.d - cp ${name}/out/org.chromium.Chaps.conf $out/etc/dbus-1/system.d/. + cp ${pname}-${version}/out/org.chromium.Chaps.conf $out/etc/dbus-1/system.d/. mkdir -p $out/etc/dbus-1/system-services - cp ${name}/platform2/chaps/org.chromium.Chaps.service $out/etc/dbus-1/system-services/. + cp ${pname}-${version}/platform2/chaps/org.chromium.Chaps.service $out/etc/dbus-1/system-services/. mkdir -p $out/usr/share/pam-configs/chaps mkdir -p $out/usr/share/man/man8 - cp ${name}/man/* $out/usr/share/man/man8/. + cp ${pname}-${version}/man/* $out/usr/share/man/man8/. ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/security/dirmngr/default.nix b/third_party/nixpkgs/pkgs/tools/security/dirmngr/default.nix index cab059ca33..3e45759c51 100644 --- a/third_party/nixpkgs/pkgs/tools/security/dirmngr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/dirmngr/default.nix @@ -2,9 +2,10 @@ , libiconv}: stdenv.mkDerivation rec { - name = "dirmngr-1.1.1"; + pname = "dirmngr"; + version = "1.1.1"; src = fetchurl { - url = "mirror://gnupg/dirmngr/${name}.tar.bz2"; + url = "mirror://gnupg/dirmngr/dirmngr-${version}.tar.bz2"; sha256 = "1zz6m87ca55nq5f59hzm6qs48d37h93il881y7d0rf2d6660na6j"; }; buildInputs = [ libgpgerror libgcrypt libassuan libksba diff --git a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix index 5197fa96cc..24b45aae13 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-17"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-rtnlPt5fsiN44AlaAZ6v7Z2u6by+OFvtMtwtWVYQvdg="; + sha256 = "sha256-3XSk6a8gaCF8X1Plyfyi1Jtfp2sDLgbstv67hvlM3Gk="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix b/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix index 3cd4ae69b9..13c44c49c6 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix @@ -16,9 +16,9 @@ buildGoModule rec { vendorSha256 = "sha256-Cc4DJPpOMHxDcH22S7znYo7QHNRXv8jOJhznu09kaE4="; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X github.com/zricethezav/gitleaks/v${lib.versions.major version}/version.Version=${version}") - ''; + ldflags = [ + "-s" "-w" "-X github.com/zricethezav/gitleaks/v${lib.versions.major version}/version.Version=${version}" + ]; meta = with lib; { description = "Scan git repos (or files) for secrets"; diff --git a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix index c24515dd1b..e27526289a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix @@ -6,22 +6,22 @@ buildGoModule rec { pname = "grype"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xiUDyuVNVkVT+kxOEFOq4RKxMc5nNjsom/ZTKzfkOhU="; + sha256 = "sha256-Xk+AyCcPQDDKKLT/tkZ2znXbBSBEgmqVqmgGBP/3Oos="; }; - vendorSha256 = "sha256-mW3e4WFa9pKSpyTZYmPA2j8nZz+94G2PqdqI0BDo3wc="; + vendorSha256 = "sha256-OAzuL1pHLLKgkKjPjupPg7LEz8sY7ehq2PONnjhvzHE="; propagatedBuildInputs = [ docker ]; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X github.com/anchore/grype/internal/version.version=${version}") - ''; + ldflags = [ + "-s" "-w" "-X github.com/anchore/grype/internal/version.version=${version}" + ]; # Tests require a running Docker instance doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/hakrawler/default.nix b/third_party/nixpkgs/pkgs/tools/security/hakrawler/default.nix index fc5ee32bcb..0e2174e50a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hakrawler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hakrawler/default.nix @@ -5,17 +5,16 @@ buildGoModule rec { pname = "hakrawler"; - version = "20201224-${lib.strings.substring 0 7 rev}"; - rev = "e39a514d0e179d33362ee244c017fb65cc2c12a5"; + version = "2.0"; src = fetchFromGitHub { owner = "hakluke"; repo = "hakrawler"; - inherit rev; - sha256 = "0wpqfbpgnr94q5n7i4zh806k8n0phyg0ncnz43hqh4bbdh7l1y8a"; + rev = version; + sha256 = "sha256-g0hJGRPLgnWAeB25iIw/JRANrYowfRtAniDD/yAQWYk="; }; - vendorSha256 = "18zs2l77ds0a3wxfqcd91h269g0agnwhginrx3j6gj30dbfls8a1"; + vendorSha256 = "sha256-VmMNUNThRP1jEAjZeJC4q1IvnQEDqoOM+7a0AnABQnU="; meta = with lib; { description = "Web crawler for the discovery of endpoints and assets"; diff --git a/third_party/nixpkgs/pkgs/tools/security/hologram/default.nix b/third_party/nixpkgs/pkgs/tools/security/hologram/default.nix index ca4666d9f0..c4e90bd94b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hologram/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hologram/default.nix @@ -1,7 +1,8 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "hologram-2018-03-19"; + pname = "hologram"; + version = "2018-03-19"; rev = "a7bab58642b530edb75b9cf6c1d834c85822ceac"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/tools/security/kiterunner/default.nix b/third_party/nixpkgs/pkgs/tools/security/kiterunner/default.nix index a553202b6c..a455c17d71 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kiterunner/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kiterunner/default.nix @@ -16,9 +16,9 @@ buildGoModule rec { vendorSha256 = "1nczzzsnh38qi949ki5268y39ggkwncanc1pv7727qpwllzl62vy"; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X github.com/assetnote/kiterunner/cmd/kiterunner/cmd.Version=${version}") - ''; + ldflags = [ + "-s" "-w" "-X github.com/assetnote/kiterunner/cmd/kiterunner/cmd.Version=${version}" + ]; subPackages = [ "./cmd/kiterunner" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/mbox/default.nix b/third_party/nixpkgs/pkgs/tools/security/mbox/default.nix index dd73e1624c..d7a303a367 100644 --- a/third_party/nixpkgs/pkgs/tools/security/mbox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/mbox/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, openssl, which }: stdenv.mkDerivation { - name = "mbox-20140526"; + pname = "mbox"; + version = "20140526"; src = fetchFromGitHub { owner = "tsgates"; diff --git a/third_party/nixpkgs/pkgs/tools/security/meo/default.nix b/third_party/nixpkgs/pkgs/tools/security/meo/default.nix index 05aa8323cc..4b96f2b42c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/meo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/meo/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchhg, openssl, pcre-cpp, qt4, boost, pkcs11helper }: stdenv.mkDerivation { - name = "meo-20121113"; + pname = "meo"; + version = "20121113"; src = fetchhg { url = "http://oss.stamfest.net/hg/meo"; diff --git a/third_party/nixpkgs/pkgs/tools/security/mkrand/default.nix b/third_party/nixpkgs/pkgs/tools/security/mkrand/default.nix index 59b48f1881..21c9586cd6 100644 --- a/third_party/nixpkgs/pkgs/tools/security/mkrand/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/mkrand/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "mkrand-0.1.0"; +stdenv.mkDerivation rec { + pname = "mkrand"; + version = "0.1.0"; src = fetchurl { - url = "https://github.com/mknight-tag/MKRAND/releases/download/v0.1.0/mkrand-0.1.0.tar.gz"; + url = "https://github.com/mknight-tag/MKRAND/releases/download/v${version}/mkrand-${version}.tar.gz"; sha256 = "1irwyv2j5c3606k3qbq77yrd65y27rcq3jdlp295rz875q8iq9fs"; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/mktemp/default.nix b/third_party/nixpkgs/pkgs/tools/security/mktemp/default.nix index dc3f2a8904..02be5103cb 100644 --- a/third_party/nixpkgs/pkgs/tools/security/mktemp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/mktemp/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, groff }: -stdenv.mkDerivation { - name = "mktemp-1.7"; +stdenv.mkDerivation rec { + pname = "mktemp"; + version = "1.7"; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. NROFF = "${groff}/bin/nroff"; @@ -12,7 +13,7 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = "ftp://ftp.mktemp.org/pub/mktemp/mktemp-1.7.tar.gz"; + url = "ftp://ftp.mktemp.org/pub/mktemp/mktemp-${version}.tar.gz"; sha256 = "0x969152znxxjbj7387xb38waslr4yv6bnj5jmhb4rpqxphvk54f"; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/munge/default.nix b/third_party/nixpkgs/pkgs/tools/security/munge/default.nix index 0462db8859..01e208958a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/munge/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/munge/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, gawk, gnused, libgcrypt, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "munge-0.5.14"; + pname = "munge"; + version = "0.5.14"; src = fetchFromGitHub { owner = "dun"; repo = "munge"; - rev = name; + rev = "${pname}-${version}"; sha256 = "15h805rwcb9f89dyrkxfclzs41n3ff8x7cc1dbvs8mb0ds682c4j"; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/onlykey-agent/default.nix b/third_party/nixpkgs/pkgs/tools/security/onlykey-agent/default.nix new file mode 100644 index 0000000000..84c65b9134 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/onlykey-agent/default.nix @@ -0,0 +1,61 @@ +{ lib +, python3Packages +, onlykey-cli +}: + +let + # onlykey requires a patched version of libagent + lib-agent = with python3Packages; libagent.overridePythonAttrs (oa: rec{ + version = "1.0.2"; + src = fetchPypi { + inherit version; + pname = "lib-agent"; + sha256 = "sha256-NAimivO3m4UUPM4JgLWGq2FbXOaXdQEL/DqZAcy+kEw="; + }; + propagatedBuildInputs = oa.propagatedBuildInputs or [ ] ++ [ + pynacl + docutils + pycryptodome + wheel + ]; + + # turn off testing because I can't get it to work + doCheck = false; + pythonImportsCheck = [ "libagent" ]; + + meta = oa.meta // { + description = "Using OnlyKey as hardware SSH and GPG agent"; + homepage = "https://github.com/trustcrypto/onlykey-agent/tree/ledger"; + maintainers = with maintainers; [ kalbasit ]; + }; + }); +in +python3Packages.buildPythonApplication rec { + pname = "onlykey-agent"; + version = "1.1.11"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-YH/cqQOVy5s6dTp2JwxM3s4xRTXgwhOr00whtHAwZZI="; + }; + + propagatedBuildInputs = with python3Packages; [ lib-agent onlykey-cli ]; + + # move the python library into the sitePackages. + postInstall = '' + mkdir $out/${python3Packages.python.sitePackages}/onlykey_agent + mv $out/bin/onlykey_agent.py $out/${python3Packages.python.sitePackages}/onlykey_agent/__init__.py + chmod a-x $out/${python3Packages.python.sitePackages}/onlykey_agent/__init__.py + ''; + + # no tests + doCheck = false; + pythonImportsCheck = [ "onlykey_agent" ]; + + meta = with lib; { + description = " The OnlyKey agent is essentially middleware that lets you use OnlyKey as a hardware SSH/GPG device."; + homepage = "https://github.com/trustcrypto/onlykey-agent"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/onlykey-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/onlykey-cli/default.nix index 51cb815db6..934604cae5 100644 --- a/third_party/nixpkgs/pkgs/tools/security/onlykey-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/onlykey-cli/default.nix @@ -2,18 +2,28 @@ python3Packages.buildPythonApplication rec { pname = "onlykey-cli"; - version = "1.2.2"; + version = "1.2.5"; src = python3Packages.fetchPypi { inherit version; pname = "onlykey"; - sha256 = "1qkbgab5xlg7bd0jfzf8k5ppb1zhib76r050fiaqi5wibrqrfwdi"; + sha256 = "sha256-7Pr1gXaPF5mctGxDciKKj0YDDQVFFi1+t6QztoKqpAA="; }; + propagatedBuildInputs = with python3Packages; [ + aenum + cython + ecdsa + hidapi + onlykey-solo-python + prompt-toolkit + pynacl + six + ]; + # Requires having the physical onlykey (a usb security key) doCheck = false; - propagatedBuildInputs = - with python3Packages; [ hidapi aenum six prompt-toolkit pynacl ecdsa cython ]; + pythonImportsCheck = [ "onlykey.cli" ]; meta = with lib; { description = "OnlyKey client and command-line tool"; diff --git a/third_party/nixpkgs/pkgs/tools/security/onlykey/default.nix b/third_party/nixpkgs/pkgs/tools/security/onlykey/default.nix new file mode 100644 index 0000000000..4cad7e513a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/onlykey/default.nix @@ -0,0 +1,63 @@ +{ fetchgit +, lib +, makeDesktopItem +, node_webkit +, pkgs +, runCommand +, stdenv +, writeShellScript +}: + +let + # parse the version from package.json + version = + let + packageJson = builtins.fromJSON (builtins.readFile ./package.json); + splits = builtins.split "^.*#v(.*)$" (builtins.getAttr "onlykey" (builtins.head packageJson)); + matches = builtins.elemAt splits 1; + elem = builtins.head matches; + in + elem; + + # this must be updated anytime this package is updated. + onlykeyPkg = "onlykey-git://github.com/trustcrypto/OnlyKey-App.git#v${version}"; + + # define a shortcut to get to onlykey. + onlykey = self."${onlykeyPkg}"; + + super = (import ./onlykey.nix { + inherit pkgs; + inherit (stdenv.hostPlatform) system; + }); + + self = super // { + "${onlykeyPkg}" = super."${onlykeyPkg}".override (attrs: { + # when installing packages, nw tries to download nwjs in its postInstall + # script. There are currently no other postInstall scripts, so this + # should not break other things. + npmFlags = attrs.npmFlags or "" + " --ignore-scripts"; + + # this package requires to be built in order to become runnable. + postInstall = '' + cd $out/lib/node_modules/${attrs.packageName} + npm run build + ''; + }); + }; + + script = writeShellScript "${onlykey.packageName}-starter-${onlykey.version}" '' + ${node_webkit}/bin/nw ${onlykey}/lib/node_modules/${onlykey.packageName}/build + ''; + + desktop = makeDesktopItem { + name = onlykey.packageName; + exec = script; + icon = "${onlykey}/lib/node_modules/${onlykey.packageName}/resources/onlykey_logo_128.png"; + desktopName = onlykey.packageName; + genericName = onlykey.packageName; + }; +in +runCommand "${onlykey.packageName}-${onlykey.version}" { } '' + mkdir -p $out/bin + ln -s ${script} $out/bin/onlykey +'' diff --git a/third_party/nixpkgs/pkgs/tools/security/onlykey/generate.sh b/third_party/nixpkgs/pkgs/tools/security/onlykey/generate.sh new file mode 100755 index 0000000000..ec37304923 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/onlykey/generate.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix + +# XXX: --development is given here because we need access to gulp in order to build OnlyKey. +exec node2nix --nodejs-14 --development -i package.json -c onlykey.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env diff --git a/third_party/nixpkgs/pkgs/tools/security/onlykey/node-packages.nix b/third_party/nixpkgs/pkgs/tools/security/onlykey/node-packages.nix new file mode 100644 index 0000000000..d6713a0f42 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/onlykey/node-packages.nix @@ -0,0 +1,7716 @@ +# This file has been generated by node2nix 1.9.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: + +let + sources = { + "@babel/code-frame-7.14.5" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz"; + sha512 = "9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw=="; + }; + }; + "@babel/helper-validator-identifier-7.14.9" = { + name = "_at_babel_slash_helper-validator-identifier"; + packageName = "@babel/helper-validator-identifier"; + version = "7.14.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz"; + sha512 = "pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g=="; + }; + }; + "@babel/highlight-7.14.5" = { + name = "_at_babel_slash_highlight"; + packageName = "@babel/highlight"; + version = "7.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz"; + sha512 = "qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg=="; + }; + }; + "@gulp-sourcemaps/identity-map-1.0.2" = { + name = "_at_gulp-sourcemaps_slash_identity-map"; + packageName = "@gulp-sourcemaps/identity-map"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz"; + sha512 = "ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ=="; + }; + }; + "@gulp-sourcemaps/map-sources-1.0.0" = { + name = "_at_gulp-sourcemaps_slash_map-sources"; + packageName = "@gulp-sourcemaps/map-sources"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz"; + sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda"; + }; + }; + "@ungap/promise-all-settled-1.1.2" = { + name = "_at_ungap_slash_promise-all-settled"; + packageName = "@ungap/promise-all-settled"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz"; + sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; + }; + }; + "abbrev-1.1.1" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; + }; + }; + "acorn-5.7.4" = { + name = "acorn"; + packageName = "acorn"; + version = "5.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz"; + sha512 = "1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="; + }; + }; + "acorn-7.4.1" = { + name = "acorn"; + packageName = "acorn"; + version = "7.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"; + sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; + }; + }; + "acorn-jsx-5.3.2" = { + name = "acorn-jsx"; + packageName = "acorn-jsx"; + version = "5.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; + sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; + }; + }; + "ajv-6.12.6" = { + name = "ajv"; + packageName = "ajv"; + version = "6.12.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; + }; + }; + "ansi-colors-1.1.0" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz"; + sha512 = "SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA=="; + }; + }; + "ansi-colors-4.1.1" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; + }; + }; + "ansi-escapes-4.3.2" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; + sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="; + }; + }; + "ansi-gray-0.1.1" = { + name = "ansi-gray"; + packageName = "ansi-gray"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz"; + sha1 = "2962cf54ec9792c48510a3deb524436861ef7251"; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "ansi-regex-4.1.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; + }; + }; + "ansi-regex-5.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; + }; + }; + "ansi-styles-2.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + }; + "ansi-styles-3.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + }; + "ansi-styles-4.3.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; + }; + }; + "ansi-wrap-0.1.0" = { + name = "ansi-wrap"; + packageName = "ansi-wrap"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz"; + sha1 = "a82250ddb0015e9a27ca82e82ea603bbfa45efaf"; + }; + }; + "anymatch-1.3.2" = { + name = "anymatch"; + packageName = "anymatch"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz"; + sha512 = "0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA=="; + }; + }; + "anymatch-2.0.0" = { + name = "anymatch"; + packageName = "anymatch"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz"; + sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; + }; + }; + "anymatch-3.1.2" = { + name = "anymatch"; + packageName = "anymatch"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz"; + sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; + }; + }; + "append-buffer-1.0.2" = { + name = "append-buffer"; + packageName = "append-buffer"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz"; + sha1 = "d8220cf466081525efea50614f3de6514dfa58f1"; + }; + }; + "applescript-1.0.0" = { + name = "applescript"; + packageName = "applescript"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/applescript/-/applescript-1.0.0.tgz"; + sha1 = "bb87af568cad034a4e48c4bdaf6067a3a2701317"; + }; + }; + "archy-1.0.0" = { + name = "archy"; + packageName = "archy"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"; + sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; + }; + }; + "argparse-1.0.10" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; + }; + }; + "argparse-2.0.1" = { + name = "argparse"; + packageName = "argparse"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"; + sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; + }; + }; + "arr-diff-2.0.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz"; + sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf"; + }; + }; + "arr-diff-4.0.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + }; + "arr-filter-1.1.2" = { + name = "arr-filter"; + packageName = "arr-filter"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz"; + sha1 = "43fdddd091e8ef11aa4c45d9cdc18e2dff1711ee"; + }; + }; + "arr-flatten-1.1.0" = { + name = "arr-flatten"; + packageName = "arr-flatten"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="; + }; + }; + "arr-map-2.0.2" = { + name = "arr-map"; + packageName = "arr-map"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz"; + sha1 = "3a77345ffc1cf35e2a91825601f9e58f2e24cac4"; + }; + }; + "arr-union-3.1.0" = { + name = "arr-union"; + packageName = "arr-union"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + }; + }; + "array-each-1.0.1" = { + name = "array-each"; + packageName = "array-each"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz"; + sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f"; + }; + }; + "array-initial-1.1.0" = { + name = "array-initial"; + packageName = "array-initial"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz"; + sha1 = "2fa74b26739371c3947bd7a7adc73be334b3d795"; + }; + }; + "array-last-1.3.0" = { + name = "array-last"; + packageName = "array-last"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz"; + sha512 = "eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg=="; + }; + }; + "array-slice-1.1.0" = { + name = "array-slice"; + packageName = "array-slice"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz"; + sha512 = "B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w=="; + }; + }; + "array-sort-1.0.0" = { + name = "array-sort"; + packageName = "array-sort"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz"; + sha512 = "ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg=="; + }; + }; + "array-unique-0.2.1" = { + name = "array-unique"; + packageName = "array-unique"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz"; + sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53"; + }; + }; + "array-unique-0.3.2" = { + name = "array-unique"; + packageName = "array-unique"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + }; + "asn1-0.2.4" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; + "assertion-error-1.1.0" = { + name = "assertion-error"; + packageName = "assertion-error"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz"; + sha512 = "jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw=="; + }; + }; + "assign-symbols-1.0.0" = { + name = "assign-symbols"; + packageName = "assign-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + }; + "astral-regex-1.0.0" = { + name = "astral-regex"; + packageName = "astral-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz"; + sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; + }; + }; + "async-done-1.3.2" = { + name = "async-done"; + packageName = "async-done"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz"; + sha512 = "uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw=="; + }; + }; + "async-each-1.0.3" = { + name = "async-each"; + packageName = "async-each"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz"; + sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; + }; + }; + "async-settle-1.0.0" = { + name = "async-settle"; + packageName = "async-settle"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz"; + sha1 = "1d0a914bb02575bec8a8f3a74e5080f72b2c0c6b"; + }; + }; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + }; + "atob-2.1.2" = { + name = "atob"; + packageName = "atob"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"; + sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; + }; + }; + "auto-launch-5.0.5" = { + name = "auto-launch"; + packageName = "auto-launch"; + version = "5.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/auto-launch/-/auto-launch-5.0.5.tgz"; + sha512 = "ppdF4mihhYzMYLuCcx9H/c5TUOCev8uM7en53zWVQhyYAJrurd2bFZx3qQVeJKF2jrc7rsPRNN5cD+i23l6PdA=="; + }; + }; + "aws-sign2-0.7.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + }; + "aws4-1.11.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"; + sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; + }; + }; + "bach-1.2.0" = { + name = "bach"; + packageName = "bach"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz"; + sha1 = "4b3ce96bf27134f79a1b414a51c14e34c3bd9880"; + }; + }; + "balanced-match-1.0.2" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; + }; + }; + "base-0.11.2" = { + name = "base"; + packageName = "base"; + version = "0.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; + sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; + }; + }; + "base64-js-1.5.1" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; + }; + }; + "bcrypt-pbkdf-1.0.2" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + }; + "binary-0.3.0" = { + name = "binary"; + packageName = "binary"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz"; + sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79"; + }; + }; + "binary-extensions-1.13.1" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "1.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz"; + sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; + }; + }; + "binary-extensions-2.2.0" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; + }; + }; + "bindings-1.5.0" = { + name = "bindings"; + packageName = "bindings"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"; + sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; + }; + }; + "bl-1.2.3" = { + name = "bl"; + packageName = "bl"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz"; + sha512 = "pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww=="; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + }; + "braces-1.8.5" = { + name = "braces"; + packageName = "braces"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz"; + sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; + }; + }; + "braces-2.3.2" = { + name = "braces"; + packageName = "braces"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"; + sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; + }; + }; + "braces-3.0.2" = { + name = "braces"; + packageName = "braces"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; + }; + }; + "browser-stdout-1.3.1" = { + name = "browser-stdout"; + packageName = "browser-stdout"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz"; + sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; + }; + }; + "buffer-5.7.1" = { + name = "buffer"; + packageName = "buffer"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; + }; + }; + "buffer-alloc-1.2.0" = { + name = "buffer-alloc"; + packageName = "buffer-alloc"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz"; + sha512 = "CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow=="; + }; + }; + "buffer-alloc-unsafe-1.1.0" = { + name = "buffer-alloc-unsafe"; + packageName = "buffer-alloc-unsafe"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"; + sha512 = "TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="; + }; + }; + "buffer-crc32-0.2.13" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + }; + }; + "buffer-equal-1.0.0" = { + name = "buffer-equal"; + packageName = "buffer-equal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz"; + sha1 = "59616b498304d556abd466966b22eeda3eca5fbe"; + }; + }; + "buffer-fill-1.0.0" = { + name = "buffer-fill"; + packageName = "buffer-fill"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz"; + sha1 = "f8f78b76789888ef39f205cd637f68e702122b2c"; + }; + }; + "buffer-from-1.1.2" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"; + sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; + }; + }; + "buffer-to-vinyl-1.1.0" = { + name = "buffer-to-vinyl"; + packageName = "buffer-to-vinyl"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz"; + sha1 = "00f15faee3ab7a1dda2cde6d9121bffdd07b2262"; + }; + }; + "buffers-0.1.1" = { + name = "buffers"; + packageName = "buffers"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"; + sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"; + }; + }; + "cache-base-1.0.1" = { + name = "cache-base"; + packageName = "cache-base"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; + sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; + }; + }; + "call-bind-1.0.2" = { + name = "call-bind"; + packageName = "call-bind"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; + sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; + }; + }; + "callsites-3.1.0" = { + name = "callsites"; + packageName = "callsites"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; + }; + }; + "camelcase-2.1.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; + sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; + }; + }; + "camelcase-3.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; + }; + }; + "camelcase-6.2.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz"; + sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; + }; + }; + "capture-stack-trace-1.0.1" = { + name = "capture-stack-trace"; + packageName = "capture-stack-trace"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz"; + sha512 = "mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw=="; + }; + }; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + }; + "caw-2.0.1" = { + name = "caw"; + packageName = "caw"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz"; + sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA=="; + }; + }; + "chai-4.3.4" = { + name = "chai"; + packageName = "chai"; + version = "4.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz"; + sha512 = "yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA=="; + }; + }; + "chai-as-promised-7.1.1" = { + name = "chai-as-promised"; + packageName = "chai-as-promised"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz"; + sha512 = "azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA=="; + }; + }; + "chainsaw-0.1.0" = { + name = "chainsaw"; + packageName = "chainsaw"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz"; + sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98"; + }; + }; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + }; + "chalk-2.4.2" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; + }; + }; + "chalk-4.1.2" = { + name = "chalk"; + packageName = "chalk"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; + }; + }; + "chardet-0.7.0" = { + name = "chardet"; + packageName = "chardet"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"; + sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; + }; + }; + "charm-0.1.2" = { + name = "charm"; + packageName = "charm"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/charm/-/charm-0.1.2.tgz"; + sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296"; + }; + }; + "check-error-1.0.2" = { + name = "check-error"; + packageName = "check-error"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz"; + sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82"; + }; + }; + "chokidar-1.7.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz"; + sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; + }; + }; + "chokidar-2.1.8" = { + name = "chokidar"; + packageName = "chokidar"; + version = "2.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz"; + sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg=="; + }; + }; + "chokidar-3.5.1" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz"; + sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw=="; + }; + }; + "class-utils-0.3.6" = { + name = "class-utils"; + packageName = "class-utils"; + version = "0.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; + sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; + }; + }; + "cli-cursor-3.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"; + sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; + }; + }; + "cli-width-3.0.0" = { + name = "cli-width"; + packageName = "cli-width"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz"; + sha512 = "FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw=="; + }; + }; + "cliui-3.2.0" = { + name = "cliui"; + packageName = "cliui"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; + sha1 = "120601537a916d29940f934da3b48d585a39213d"; + }; + }; + "cliui-7.0.4" = { + name = "cliui"; + packageName = "cliui"; + version = "7.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"; + sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; + }; + }; + "clone-0.2.0" = { + name = "clone"; + packageName = "clone"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"; + sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"; + }; + }; + "clone-1.0.4" = { + name = "clone"; + packageName = "clone"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"; + sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; + }; + }; + "clone-2.1.2" = { + name = "clone"; + packageName = "clone"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"; + sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f"; + }; + }; + "clone-buffer-1.0.0" = { + name = "clone-buffer"; + packageName = "clone-buffer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz"; + sha1 = "e3e25b207ac4e701af721e2cb5a16792cac3dc58"; + }; + }; + "clone-stats-0.0.1" = { + name = "clone-stats"; + packageName = "clone-stats"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"; + sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1"; + }; + }; + "clone-stats-1.0.0" = { + name = "clone-stats"; + packageName = "clone-stats"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz"; + sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680"; + }; + }; + "cloneable-readable-1.1.3" = { + name = "cloneable-readable"; + packageName = "cloneable-readable"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz"; + sha512 = "2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ=="; + }; + }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; + "collection-map-1.0.0" = { + name = "collection-map"; + packageName = "collection-map"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz"; + sha1 = "aea0f06f8d26c780c2b75494385544b2255af18c"; + }; + }; + "collection-visit-1.0.0" = { + name = "collection-visit"; + packageName = "collection-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + }; + "color-convert-1.9.3" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + }; + "color-convert-2.0.1" = { + name = "color-convert"; + packageName = "color-convert"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; + }; + }; + "color-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + }; + "color-name-1.1.4" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; + }; + }; + "color-support-1.1.3" = { + name = "color-support"; + packageName = "color-support"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"; + sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; + }; + }; + "combined-stream-1.0.8" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; + }; + }; + "commander-2.20.3" = { + name = "commander"; + packageName = "commander"; + version = "2.20.3"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; + sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; + }; + }; + "component-emitter-1.3.0" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz"; + sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "concat-stream-1.6.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; + }; + }; + "config-chain-1.1.13" = { + name = "config-chain"; + packageName = "config-chain"; + version = "1.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz"; + sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; + }; + }; + "convert-source-map-1.8.0" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz"; + sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; + }; + }; + "copy-descriptor-0.1.1" = { + name = "copy-descriptor"; + packageName = "copy-descriptor"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + }; + "copy-props-2.0.5" = { + name = "copy-props"; + packageName = "copy-props"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz"; + sha512 = "XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw=="; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "create-error-class-3.0.2" = { + name = "create-error-class"; + packageName = "create-error-class"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; + sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + }; + }; + "cross-spawn-6.0.5" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "6.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; + }; + }; + "css-2.2.4" = { + name = "css"; + packageName = "css"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/css/-/css-2.2.4.tgz"; + sha512 = "oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw=="; + }; + }; + "d-1.0.1" = { + name = "d"; + packageName = "d"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz"; + sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; + }; + }; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + }; + "debounce-1.2.1" = { + name = "debounce"; + packageName = "debounce"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz"; + sha512 = "XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug=="; + }; + }; + "debug-2.6.9" = { + name = "debug"; + packageName = "debug"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + }; + }; + "debug-3.2.7" = { + name = "debug"; + packageName = "debug"; + version = "3.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; + sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; + }; + }; + "debug-4.3.1" = { + name = "debug"; + packageName = "debug"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz"; + sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; + }; + }; + "debug-4.3.2" = { + name = "debug"; + packageName = "debug"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; + }; + }; + "debug-fabulous-1.1.0" = { + name = "debug-fabulous"; + packageName = "debug-fabulous"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz"; + sha512 = "GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg=="; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "decamelize-4.0.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz"; + sha512 = "9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ=="; + }; + }; + "decode-uri-component-0.2.0" = { + name = "decode-uri-component"; + packageName = "decode-uri-component"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + }; + "decompress-3.0.0" = { + name = "decompress"; + packageName = "decompress"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz"; + sha1 = "af1dd50d06e3bfc432461d37de11b38c0d991bed"; + }; + }; + "decompress-4.2.1" = { + name = "decompress"; + packageName = "decompress"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz"; + sha512 = "e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ=="; + }; + }; + "decompress-tar-3.1.0" = { + name = "decompress-tar"; + packageName = "decompress-tar"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz"; + sha1 = "217c789f9b94450efaadc5c5e537978fc333c466"; + }; + }; + "decompress-tar-4.1.1" = { + name = "decompress-tar"; + packageName = "decompress-tar"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz"; + sha512 = "JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ=="; + }; + }; + "decompress-tarbz2-3.1.0" = { + name = "decompress-tarbz2"; + packageName = "decompress-tarbz2"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz"; + sha1 = "8b23935681355f9f189d87256a0f8bdd96d9666d"; + }; + }; + "decompress-tarbz2-4.1.1" = { + name = "decompress-tarbz2"; + packageName = "decompress-tarbz2"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz"; + sha512 = "s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A=="; + }; + }; + "decompress-targz-3.1.0" = { + name = "decompress-targz"; + packageName = "decompress-targz"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz"; + sha1 = "b2c13df98166268991b715d6447f642e9696f5a0"; + }; + }; + "decompress-targz-4.1.1" = { + name = "decompress-targz"; + packageName = "decompress-targz"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz"; + sha512 = "4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w=="; + }; + }; + "decompress-unzip-3.4.0" = { + name = "decompress-unzip"; + packageName = "decompress-unzip"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz"; + sha1 = "61475b4152066bbe3fee12f9d629d15fe6478eeb"; + }; + }; + "decompress-unzip-4.0.1" = { + name = "decompress-unzip"; + packageName = "decompress-unzip"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz"; + sha1 = "deaaccdfd14aeaf85578f733ae8210f9b4848f69"; + }; + }; + "decompress-zip-0.3.3" = { + name = "decompress-zip"; + packageName = "decompress-zip"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-zip/-/decompress-zip-0.3.3.tgz"; + sha512 = "/fy1L4s+4jujqj3kNptWjilFw3E6De8U6XUFvqmh4npN3Vsypm3oT2V0bXcmbBWS+5j5tr4okYaFrOmyZkszEg=="; + }; + }; + "deep-eql-3.0.1" = { + name = "deep-eql"; + packageName = "deep-eql"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz"; + sha512 = "+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw=="; + }; + }; + "deep-is-0.1.3" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + }; + "default-compare-1.0.0" = { + name = "default-compare"; + packageName = "default-compare"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz"; + sha512 = "QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ=="; + }; + }; + "default-resolution-2.0.0" = { + name = "default-resolution"; + packageName = "default-resolution"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz"; + sha1 = "bcb82baa72ad79b426a76732f1a81ad6df26d684"; + }; + }; + "define-properties-1.1.3" = { + name = "define-properties"; + packageName = "define-properties"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; + }; + }; + "define-property-0.2.5" = { + name = "define-property"; + packageName = "define-property"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + }; + "define-property-1.0.0" = { + name = "define-property"; + packageName = "define-property"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + }; + "define-property-2.0.2" = { + name = "define-property"; + packageName = "define-property"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; + sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "detect-file-1.0.0" = { + name = "detect-file"; + packageName = "detect-file"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"; + sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; + }; + }; + "detect-newline-2.1.0" = { + name = "detect-newline"; + packageName = "detect-newline"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz"; + sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"; + }; + }; + "diff-5.0.0" = { + name = "diff"; + packageName = "diff"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz"; + sha512 = "/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w=="; + }; + }; + "doctrine-3.0.0" = { + name = "doctrine"; + packageName = "doctrine"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"; + sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; + }; + }; + "download-5.0.3" = { + name = "download"; + packageName = "download"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/download/-/download-5.0.3.tgz"; + sha1 = "63537f977f99266a30eb8a2a2fbd1f20b8000f7a"; + }; + }; + "duplexer2-0.1.4" = { + name = "duplexer2"; + packageName = "duplexer2"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz"; + sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; + }; + }; + "duplexer3-0.1.4" = { + name = "duplexer3"; + packageName = "duplexer3"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + }; + "duplexify-3.7.1" = { + name = "duplexify"; + packageName = "duplexify"; + version = "3.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz"; + sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; + }; + }; + "each-props-1.3.2" = { + name = "each-props"; + packageName = "each-props"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz"; + sha512 = "vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA=="; + }; + }; + "ecc-jsbn-0.1.2" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + }; + "emoji-regex-7.0.3" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; + }; + }; + "emoji-regex-8.0.0" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; + }; + }; + "end-of-stream-1.4.4" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; + }; + }; + "error-ex-1.3.2" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; + }; + }; + "es5-ext-0.10.53" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.10.53"; + src = fetchurl { + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz"; + sha512 = "Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q=="; + }; + }; + "es6-iterator-2.0.3" = { + name = "es6-iterator"; + packageName = "es6-iterator"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"; + sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; + }; + }; + "es6-symbol-3.1.3" = { + name = "es6-symbol"; + packageName = "es6-symbol"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz"; + sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA=="; + }; + }; + "es6-weak-map-2.0.3" = { + name = "es6-weak-map"; + packageName = "es6-weak-map"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz"; + sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA=="; + }; + }; + "escalade-3.1.1" = { + name = "escalade"; + packageName = "escalade"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "escape-string-regexp-4.0.0" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; + }; + }; + "eslint-6.8.0" = { + name = "eslint"; + packageName = "eslint"; + version = "6.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz"; + sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig=="; + }; + }; + "eslint-scope-5.1.1" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; + }; + }; + "eslint-utils-1.4.3" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz"; + sha512 = "fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q=="; + }; + }; + "eslint-visitor-keys-1.3.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; + }; + }; + "espree-6.2.1" = { + name = "espree"; + packageName = "espree"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz"; + sha512 = "ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw=="; + }; + }; + "esprima-4.0.1" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; + }; + }; + "esquery-1.4.0" = { + name = "esquery"; + packageName = "esquery"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"; + sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; + }; + }; + "esrecurse-4.3.0" = { + name = "esrecurse"; + packageName = "esrecurse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"; + sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; + }; + }; + "estraverse-4.3.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; + }; + }; + "estraverse-5.2.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz"; + sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="; + }; + }; + "esutils-2.0.3" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; + }; + }; + "event-emitter-0.3.5" = { + name = "event-emitter"; + packageName = "event-emitter"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; + sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; + }; + }; + "expand-brackets-0.1.5" = { + name = "expand-brackets"; + packageName = "expand-brackets"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz"; + sha1 = "df07284e342a807cd733ac5af72411e581d1177b"; + }; + }; + "expand-brackets-2.1.4" = { + name = "expand-brackets"; + packageName = "expand-brackets"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + }; + "expand-range-1.8.2" = { + name = "expand-range"; + packageName = "expand-range"; + version = "1.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz"; + sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; + }; + }; + "expand-tilde-2.0.2" = { + name = "expand-tilde"; + packageName = "expand-tilde"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; + }; + }; + "ext-1.4.0" = { + name = "ext"; + packageName = "ext"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz"; + sha512 = "Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A=="; + }; + }; + "extend-3.0.2" = { + name = "extend"; + packageName = "extend"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; + }; + }; + "extend-shallow-2.0.1" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + }; + "extend-shallow-3.0.2" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + }; + }; + "external-editor-3.1.0" = { + name = "external-editor"; + packageName = "external-editor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"; + sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; + }; + }; + "extglob-0.3.2" = { + name = "extglob"; + packageName = "extglob"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz"; + sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1"; + }; + }; + "extglob-2.0.4" = { + name = "extglob"; + packageName = "extglob"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; + sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; + }; + }; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + }; + "fancy-log-1.3.3" = { + name = "fancy-log"; + packageName = "fancy-log"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz"; + sha512 = "k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw=="; + }; + }; + "fast-deep-equal-3.1.3" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; + }; + }; + "fast-json-stable-stringify-2.1.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; + }; + }; + "fast-levenshtein-1.1.4" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz"; + sha1 = "e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9"; + }; + }; + "fast-levenshtein-2.0.6" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + }; + "fd-slicer-1.1.0" = { + name = "fd-slicer"; + packageName = "fd-slicer"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz"; + sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; + }; + }; + "figures-3.2.0" = { + name = "figures"; + packageName = "figures"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz"; + sha512 = "yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg=="; + }; + }; + "file-entry-cache-5.0.1" = { + name = "file-entry-cache"; + packageName = "file-entry-cache"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; + sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="; + }; + }; + "file-exists-2.0.0" = { + name = "file-exists"; + packageName = "file-exists"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-exists/-/file-exists-2.0.0.tgz"; + sha1 = "a24150665150e62d55bc5449281d88d2b0810dca"; + }; + }; + "file-type-3.9.0" = { + name = "file-type"; + packageName = "file-type"; + version = "3.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz"; + sha1 = "257a078384d1db8087bc449d107d52a52672b9e9"; + }; + }; + "file-type-5.2.0" = { + name = "file-type"; + packageName = "file-type"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz"; + sha1 = "2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"; + }; + }; + "file-type-6.2.0" = { + name = "file-type"; + packageName = "file-type"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz"; + sha512 = "YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg=="; + }; + }; + "file-uri-to-path-1.0.0" = { + name = "file-uri-to-path"; + packageName = "file-uri-to-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; + }; + }; + "filename-regex-2.0.1" = { + name = "filename-regex"; + packageName = "filename-regex"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz"; + sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; + }; + }; + "filename-reserved-regex-2.0.0" = { + name = "filename-reserved-regex"; + packageName = "filename-reserved-regex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz"; + sha1 = "abf73dfab735d045440abfea2d91f389ebbfa229"; + }; + }; + "filenamify-2.1.0" = { + name = "filenamify"; + packageName = "filenamify"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz"; + sha512 = "ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA=="; + }; + }; + "fill-range-2.2.4" = { + name = "fill-range"; + packageName = "fill-range"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz"; + sha512 = "cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q=="; + }; + }; + "fill-range-4.0.0" = { + name = "fill-range"; + packageName = "fill-range"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + }; + }; + "fill-range-7.0.1" = { + name = "fill-range"; + packageName = "fill-range"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + }; + }; + "find-up-1.1.2" = { + name = "find-up"; + packageName = "find-up"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; + sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; + }; + }; + "find-up-5.0.0" = { + name = "find-up"; + packageName = "find-up"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz"; + sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="; + }; + }; + "findup-sync-2.0.0" = { + name = "findup-sync"; + packageName = "findup-sync"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz"; + sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; + }; + }; + "findup-sync-3.0.0" = { + name = "findup-sync"; + packageName = "findup-sync"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz"; + sha512 = "YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg=="; + }; + }; + "fined-1.2.0" = { + name = "fined"; + packageName = "fined"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz"; + sha512 = "ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng=="; + }; + }; + "first-chunk-stream-1.0.0" = { + name = "first-chunk-stream"; + packageName = "first-chunk-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"; + sha1 = "59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"; + }; + }; + "flagged-respawn-1.0.1" = { + name = "flagged-respawn"; + packageName = "flagged-respawn"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz"; + sha512 = "lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q=="; + }; + }; + "flat-5.0.2" = { + name = "flat"; + packageName = "flat"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz"; + sha512 = "b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="; + }; + }; + "flat-cache-2.0.1" = { + name = "flat-cache"; + packageName = "flat-cache"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz"; + sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA=="; + }; + }; + "flatted-2.0.2" = { + name = "flatted"; + packageName = "flatted"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz"; + sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; + }; + }; + "flush-write-stream-1.1.1" = { + name = "flush-write-stream"; + packageName = "flush-write-stream"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz"; + sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w=="; + }; + }; + "for-in-1.0.2" = { + name = "for-in"; + packageName = "for-in"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + }; + }; + "for-own-0.1.5" = { + name = "for-own"; + packageName = "for-own"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz"; + sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; + }; + }; + "for-own-1.0.0" = { + name = "for-own"; + packageName = "for-own"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz"; + sha1 = "c63332f415cedc4b04dbfe70cf836494c53cb44b"; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "form-data-2.3.3" = { + name = "form-data"; + packageName = "form-data"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; + }; + }; + "fragment-cache-0.2.1" = { + name = "fragment-cache"; + packageName = "fragment-cache"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + }; + }; + "fs-constants-1.0.0" = { + name = "fs-constants"; + packageName = "fs-constants"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"; + sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; + }; + }; + "fs-extra-7.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz"; + sha512 = "YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw=="; + }; + }; + "fs-jetpack-4.1.1" = { + name = "fs-jetpack"; + packageName = "fs-jetpack"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-jetpack/-/fs-jetpack-4.1.1.tgz"; + sha512 = "BSZ+f6VjrMInpA6neNnUhQNFPPdf3M+I8v8M9dBRrbmExd8GNRbTJIq1tjNh86FQ4a+EoMtPcp1oemwY5ghGBw=="; + }; + }; + "fs-mkdirp-stream-1.0.0" = { + name = "fs-mkdirp-stream"; + packageName = "fs-mkdirp-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz"; + sha1 = "0b7815fc3201c6a69e14db98ce098c16935259eb"; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "fsevents-1.2.13" = { + name = "fsevents"; + packageName = "fsevents"; + version = "1.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz"; + sha512 = "oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw=="; + }; + }; + "fsevents-2.3.2" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"; + sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; + }; + }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + }; + }; + "functional-red-black-tree-1.0.1" = { + name = "functional-red-black-tree"; + packageName = "functional-red-black-tree"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + }; + }; + "get-caller-file-1.0.3" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz"; + sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; + }; + }; + "get-caller-file-2.0.5" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; + }; + }; + "get-func-name-2.0.0" = { + name = "get-func-name"; + packageName = "get-func-name"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz"; + sha1 = "ead774abee72e20409433a066366023dd6887a41"; + }; + }; + "get-intrinsic-1.1.1" = { + name = "get-intrinsic"; + packageName = "get-intrinsic"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; + }; + }; + "get-proxy-2.1.0" = { + name = "get-proxy"; + packageName = "get-proxy"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz"; + sha512 = "zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw=="; + }; + }; + "get-stdin-4.0.1" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; + sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; + }; + }; + "get-stream-2.3.1" = { + name = "get-stream"; + packageName = "get-stream"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; + sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + }; + }; + "get-stream-3.0.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + }; + }; + "get-value-2.0.6" = { + name = "get-value"; + packageName = "get-value"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + }; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + }; + "glob-5.0.15" = { + name = "glob"; + packageName = "glob"; + version = "5.0.15"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"; + sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; + }; + }; + "glob-7.1.6" = { + name = "glob"; + packageName = "glob"; + version = "7.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + }; + }; + "glob-7.1.7" = { + name = "glob"; + packageName = "glob"; + version = "7.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"; + sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; + }; + }; + "glob-base-0.3.0" = { + name = "glob-base"; + packageName = "glob-base"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"; + sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"; + }; + }; + "glob-parent-2.0.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"; + sha1 = "81383d72db054fcccf5336daa902f182f6edbb28"; + }; + }; + "glob-parent-3.1.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"; + sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + }; + }; + "glob-parent-5.1.2" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"; + sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; + }; + }; + "glob-stream-5.3.5" = { + name = "glob-stream"; + packageName = "glob-stream"; + version = "5.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz"; + sha1 = "a55665a9a8ccdc41915a87c701e32d4e016fad22"; + }; + }; + "glob-stream-6.1.0" = { + name = "glob-stream"; + packageName = "glob-stream"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz"; + sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4"; + }; + }; + "glob-watcher-5.0.5" = { + name = "glob-watcher"; + packageName = "glob-watcher"; + version = "5.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz"; + sha512 = "zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw=="; + }; + }; + "global-modules-1.0.0" = { + name = "global-modules"; + packageName = "global-modules"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; + sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg=="; + }; + }; + "global-prefix-1.0.2" = { + name = "global-prefix"; + packageName = "global-prefix"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"; + sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; + }; + }; + "globals-12.4.0" = { + name = "globals"; + packageName = "globals"; + version = "12.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz"; + sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; + }; + }; + "glogg-1.0.2" = { + name = "glogg"; + packageName = "glogg"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz"; + sha512 = "5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA=="; + }; + }; + "got-6.7.1" = { + name = "got"; + packageName = "got"; + version = "6.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; + sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; + }; + }; + "graceful-fs-4.2.8" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; + }; + }; + "growl-1.10.5" = { + name = "growl"; + packageName = "growl"; + version = "1.10.5"; + src = fetchurl { + url = "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz"; + sha512 = "qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA=="; + }; + }; + "gulp-4.0.2" = { + name = "gulp"; + packageName = "gulp"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz"; + sha512 = "dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA=="; + }; + }; + "gulp-cli-2.3.0" = { + name = "gulp-cli"; + packageName = "gulp-cli"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz"; + sha512 = "zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A=="; + }; + }; + "gulp-sourcemaps-1.6.0" = { + name = "gulp-sourcemaps"; + packageName = "gulp-sourcemaps"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz"; + sha1 = "b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c"; + }; + }; + "gulp-sourcemaps-2.6.5" = { + name = "gulp-sourcemaps"; + packageName = "gulp-sourcemaps"; + version = "2.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.5.tgz"; + sha512 = "SYLBRzPTew8T5Suh2U8jCSDKY+4NARua4aqjj8HOysBh2tSgT9u4jc1FYirAdPx1akUxxDeK++fqw6Jg0LkQRg=="; + }; + }; + "gulplog-1.0.0" = { + name = "gulplog"; + packageName = "gulplog"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz"; + sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; + }; + }; + "har-schema-2.0.0" = { + name = "har-schema"; + packageName = "har-schema"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + }; + "har-validator-5.1.5" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz"; + sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; + }; + }; + "has-1.0.3" = { + name = "has"; + packageName = "has"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + }; + "has-flag-4.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; + }; + }; + "has-symbol-support-x-1.4.2" = { + name = "has-symbol-support-x"; + packageName = "has-symbol-support-x"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz"; + sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="; + }; + }; + "has-symbols-1.0.2" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"; + sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + }; + }; + "has-to-string-tag-x-1.4.1" = { + name = "has-to-string-tag-x"; + packageName = "has-to-string-tag-x"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz"; + sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw=="; + }; + }; + "has-value-0.3.1" = { + name = "has-value"; + packageName = "has-value"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + }; + "has-value-1.0.0" = { + name = "has-value"; + packageName = "has-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + }; + "has-values-0.1.4" = { + name = "has-values"; + packageName = "has-values"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + }; + "has-values-1.0.0" = { + name = "has-values"; + packageName = "has-values"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + }; + "he-1.2.0" = { + name = "he"; + packageName = "he"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; + sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; + }; + }; + "homedir-polyfill-1.0.3" = { + name = "homedir-polyfill"; + packageName = "homedir-polyfill"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; + }; + }; + "hosted-git-info-2.8.9" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.8.9"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; + sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="; + }; + }; + "http-signature-1.2.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + }; + "iconv-lite-0.4.24" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + }; + }; + "ieee754-1.2.1" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; + }; + }; + "ignore-4.0.6" = { + name = "ignore"; + packageName = "ignore"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz"; + sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; + }; + }; + "immediate-3.0.6" = { + name = "immediate"; + packageName = "immediate"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz"; + sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"; + }; + }; + "import-fresh-3.3.0" = { + name = "import-fresh"; + packageName = "import-fresh"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"; + sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-2.0.4" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + }; + "ini-1.3.8" = { + name = "ini"; + packageName = "ini"; + version = "1.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; + }; + }; + "inquirer-7.3.3" = { + name = "inquirer"; + packageName = "inquirer"; + version = "7.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz"; + sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; + }; + }; + "interpret-1.4.0" = { + name = "interpret"; + packageName = "interpret"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz"; + sha512 = "agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="; + }; + }; + "invert-kv-1.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; + sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; + }; + }; + "is-absolute-0.1.7" = { + name = "is-absolute"; + packageName = "is-absolute"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz"; + sha1 = "847491119fccb5fb436217cc737f7faad50f603f"; + }; + }; + "is-absolute-1.0.0" = { + name = "is-absolute"; + packageName = "is-absolute"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz"; + sha512 = "dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA=="; + }; + }; + "is-accessor-descriptor-0.1.6" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + }; + "is-accessor-descriptor-1.0.0" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; + }; + }; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + }; + "is-binary-path-1.0.1" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz"; + sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; + }; + }; + "is-binary-path-2.1.0" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; + }; + }; + "is-buffer-1.1.6" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; + }; + }; + "is-bzip2-1.0.0" = { + name = "is-bzip2"; + packageName = "is-bzip2"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz"; + sha1 = "5ee58eaa5a2e9c80e21407bedf23ae5ac091b3fc"; + }; + }; + "is-core-module-2.6.0" = { + name = "is-core-module"; + packageName = "is-core-module"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz"; + sha512 = "wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ=="; + }; + }; + "is-data-descriptor-0.1.4" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + }; + "is-data-descriptor-1.0.0" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; + }; + }; + "is-descriptor-0.1.6" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; + }; + }; + "is-descriptor-1.0.2" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; + }; + }; + "is-dotfile-1.0.3" = { + name = "is-dotfile"; + packageName = "is-dotfile"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz"; + sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"; + }; + }; + "is-equal-shallow-0.1.3" = { + name = "is-equal-shallow"; + packageName = "is-equal-shallow"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"; + sha1 = "2238098fc221de0bcfa5d9eac4c45d638aa1c534"; + }; + }; + "is-extendable-0.1.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + }; + "is-extendable-1.0.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; + sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; + }; + }; + "is-extglob-1.0.0" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"; + sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; + }; + }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + }; + "is-fullwidth-code-point-3.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; + }; + }; + "is-glob-2.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"; + sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863"; + }; + }; + "is-glob-3.1.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + }; + }; + "is-glob-4.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + }; + }; + "is-gzip-1.0.0" = { + name = "is-gzip"; + packageName = "is-gzip"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz"; + sha1 = "6ca8b07b99c77998025900e555ced8ed80879a83"; + }; + }; + "is-natural-number-2.1.1" = { + name = "is-natural-number"; + packageName = "is-natural-number"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz"; + sha1 = "7d4c5728377ef386c3e194a9911bf57c6dc335e7"; + }; + }; + "is-natural-number-4.0.1" = { + name = "is-natural-number"; + packageName = "is-natural-number"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz"; + sha1 = "ab9d76e1db4ced51e35de0c72ebecf09f734cde8"; + }; + }; + "is-negated-glob-1.0.0" = { + name = "is-negated-glob"; + packageName = "is-negated-glob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz"; + sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; + }; + }; + "is-number-2.1.0" = { + name = "is-number"; + packageName = "is-number"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz"; + sha1 = "01fcbbb393463a548f2f466cce16dece49db908f"; + }; + }; + "is-number-3.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + }; + "is-number-4.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz"; + sha512 = "rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="; + }; + }; + "is-number-7.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; + }; + }; + "is-object-1.0.2" = { + name = "is-object"; + packageName = "is-object"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz"; + sha512 = "2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA=="; + }; + }; + "is-plain-obj-2.1.0" = { + name = "is-plain-obj"; + packageName = "is-plain-obj"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz"; + sha512 = "YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA=="; + }; + }; + "is-plain-object-2.0.4" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; + }; + }; + "is-plain-object-5.0.0" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"; + sha512 = "VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="; + }; + }; + "is-posix-bracket-0.1.1" = { + name = "is-posix-bracket"; + packageName = "is-posix-bracket"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"; + sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; + }; + }; + "is-primitive-2.0.0" = { + name = "is-primitive"; + packageName = "is-primitive"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"; + sha1 = "207bab91638499c07b2adf240a41a87210034575"; + }; + }; + "is-promise-2.2.2" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz"; + sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; + }; + }; + "is-redirect-1.0.0" = { + name = "is-redirect"; + packageName = "is-redirect"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz"; + sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; + }; + }; + "is-relative-0.1.3" = { + name = "is-relative"; + packageName = "is-relative"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"; + sha1 = "905fee8ae86f45b3ec614bc3c15c869df0876e82"; + }; + }; + "is-relative-1.0.0" = { + name = "is-relative"; + packageName = "is-relative"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz"; + sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="; + }; + }; + "is-retry-allowed-1.2.0" = { + name = "is-retry-allowed"; + packageName = "is-retry-allowed"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz"; + sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="; + }; + }; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + }; + "is-tar-1.0.0" = { + name = "is-tar"; + packageName = "is-tar"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz"; + sha1 = "2f6b2e1792c1f5bb36519acaa9d65c0d26fe853d"; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "is-unc-path-1.0.0" = { + name = "is-unc-path"; + packageName = "is-unc-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz"; + sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ=="; + }; + }; + "is-utf8-0.2.1" = { + name = "is-utf8"; + packageName = "is-utf8"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; + sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; + }; + }; + "is-valid-glob-0.3.0" = { + name = "is-valid-glob"; + packageName = "is-valid-glob"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz"; + sha1 = "d4b55c69f51886f9b65c70d6c2622d37e29f48fe"; + }; + }; + "is-valid-glob-1.0.0" = { + name = "is-valid-glob"; + packageName = "is-valid-glob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz"; + sha1 = "29bf3eff701be2d4d315dbacc39bc39fe8f601aa"; + }; + }; + "is-windows-1.0.2" = { + name = "is-windows"; + packageName = "is-windows"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; + sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; + }; + }; + "is-zip-1.0.0" = { + name = "is-zip"; + packageName = "is-zip"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz"; + sha1 = "47b0a8ff4d38a76431ccfd99a8e15a4c86ba2325"; + }; + }; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "isexe-2.0.0" = { + name = "isexe"; + packageName = "isexe"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + }; + "isobject-2.1.0" = { + name = "isobject"; + packageName = "isobject"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + }; + "isobject-3.0.1" = { + name = "isobject"; + packageName = "isobject"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "isurl-1.0.0" = { + name = "isurl"; + packageName = "isurl"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz"; + sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="; + }; + }; + "js-tokens-4.0.0" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; + }; + }; + "js-yaml-3.14.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"; + sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; + }; + }; + "js-yaml-4.0.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz"; + sha512 = "pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q=="; + }; + }; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + }; + "json-10.0.0" = { + name = "json"; + packageName = "json"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json/-/json-10.0.0.tgz"; + sha512 = "iK7tAZtpoghibjdB1ncCWykeBMmke3JThUe+rnkD4qkZaglOIQ70Pw7r5UJ4lyUT+7gnw7ehmmLUHDuhqzQD+g=="; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "json-schema-traverse-0.4.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; + }; + }; + "json-stable-stringify-without-jsonify-1.0.1" = { + name = "json-stable-stringify-without-jsonify"; + packageName = "json-stable-stringify-without-jsonify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "jsonfile-4.0.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + }; + "jsprim-1.4.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + }; + "jszip-3.7.1" = { + name = "jszip"; + packageName = "jszip"; + version = "3.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz"; + sha512 = "ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg=="; + }; + }; + "just-debounce-1.1.0" = { + name = "just-debounce"; + packageName = "just-debounce"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz"; + sha512 = "qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ=="; + }; + }; + "kind-of-3.2.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + }; + "kind-of-4.0.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + }; + "kind-of-5.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; + sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; + }; + }; + "kind-of-6.0.3" = { + name = "kind-of"; + packageName = "kind-of"; + version = "6.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"; + sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; + }; + }; + "last-run-1.1.1" = { + name = "last-run"; + packageName = "last-run"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz"; + sha1 = "45b96942c17b1c79c772198259ba943bebf8ca5b"; + }; + }; + "lazystream-1.0.0" = { + name = "lazystream"; + packageName = "lazystream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz"; + sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; + }; + }; + "lcid-1.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; + sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; + }; + }; + "lead-1.0.0" = { + name = "lead"; + packageName = "lead"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz"; + sha1 = "6f14f99a37be3a9dd784f5495690e5903466ee42"; + }; + }; + "levn-0.3.0" = { + name = "levn"; + packageName = "levn"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + }; + "lie-3.3.0" = { + name = "lie"; + packageName = "lie"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz"; + sha512 = "UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ=="; + }; + }; + "liftoff-3.1.0" = { + name = "liftoff"; + packageName = "liftoff"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz"; + sha512 = "DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog=="; + }; + }; + "load-json-file-1.1.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; + sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; + }; + }; + "locate-path-6.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz"; + sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; + }; + }; + "lodash-4.17.21" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.21"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; + }; + }; + "lodash.isequal-4.5.0" = { + name = "lodash.isequal"; + packageName = "lodash.isequal"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; + sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; + }; + }; + "log-symbols-4.0.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz"; + sha512 = "FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA=="; + }; + }; + "lowercase-keys-1.0.1" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; + }; + }; + "lru-queue-0.1.0" = { + name = "lru-queue"; + packageName = "lru-queue"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz"; + sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3"; + }; + }; + "make-dir-1.3.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz"; + sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ=="; + }; + }; + "make-iterator-1.0.1" = { + name = "make-iterator"; + packageName = "make-iterator"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz"; + sha512 = "pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw=="; + }; + }; + "map-cache-0.2.2" = { + name = "map-cache"; + packageName = "map-cache"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + }; + "map-visit-1.0.0" = { + name = "map-visit"; + packageName = "map-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + }; + "matchdep-2.0.0" = { + name = "matchdep"; + packageName = "matchdep"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz"; + sha1 = "c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e"; + }; + }; + "math-random-1.0.4" = { + name = "math-random"; + packageName = "math-random"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz"; + sha512 = "rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="; + }; + }; + "memoizee-0.4.15" = { + name = "memoizee"; + packageName = "memoizee"; + version = "0.4.15"; + src = fetchurl { + url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz"; + sha512 = "UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ=="; + }; + }; + "merge-1.2.1" = { + name = "merge"; + packageName = "merge"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz"; + sha512 = "VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="; + }; + }; + "merge-stream-1.0.1" = { + name = "merge-stream"; + packageName = "merge-stream"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz"; + sha1 = "4041202d508a342ba00174008df0c251b8c135e1"; + }; + }; + "micromatch-2.3.11" = { + name = "micromatch"; + packageName = "micromatch"; + version = "2.3.11"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"; + sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; + }; + }; + "micromatch-3.1.10" = { + name = "micromatch"; + packageName = "micromatch"; + version = "3.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; + sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; + }; + }; + "mime-db-1.49.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.49.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz"; + sha512 = "CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="; + }; + }; + "mime-types-2.1.32" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.32"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz"; + sha512 = "hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A=="; + }; + }; + "mimic-fn-2.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + }; + "minimist-1.2.5" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + }; + }; + "mixin-deep-1.3.2" = { + name = "mixin-deep"; + packageName = "mixin-deep"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz"; + sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; + }; + }; + "mkdirp-0.5.5" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + }; + }; + "mkpath-0.1.0" = { + name = "mkpath"; + packageName = "mkpath"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz"; + sha1 = "7554a6f8d871834cc97b5462b122c4c124d6de91"; + }; + }; + "mocha-8.4.0" = { + name = "mocha"; + packageName = "mocha"; + version = "8.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz"; + sha512 = "hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ=="; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "ms-2.1.2" = { + name = "ms"; + packageName = "ms"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; + "ms-2.1.3" = { + name = "ms"; + packageName = "ms"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; + }; + }; + "multimeter-0.1.1" = { + name = "multimeter"; + packageName = "multimeter"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/multimeter/-/multimeter-0.1.1.tgz"; + sha1 = "f856c80fc3cf0f1d4ad8eb36ad68735e3ed5b3ea"; + }; + }; + "mute-stdout-1.0.1" = { + name = "mute-stdout"; + packageName = "mute-stdout"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz"; + sha512 = "kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg=="; + }; + }; + "mute-stream-0.0.8" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"; + sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; + }; + }; + "nan-2.15.0" = { + name = "nan"; + packageName = "nan"; + version = "2.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz"; + sha512 = "8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="; + }; + }; + "nanoid-3.1.20" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.1.20"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz"; + sha512 = "a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw=="; + }; + }; + "nanomatch-1.2.13" = { + name = "nanomatch"; + packageName = "nanomatch"; + version = "1.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"; + sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; + }; + }; + "natural-compare-1.4.0" = { + name = "natural-compare"; + packageName = "natural-compare"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + }; + "next-tick-1.0.0" = { + name = "next-tick"; + packageName = "next-tick"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"; + sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; + }; + }; + "next-tick-1.1.0" = { + name = "next-tick"; + packageName = "next-tick"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz"; + sha512 = "CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="; + }; + }; + "nice-try-1.0.5" = { + name = "nice-try"; + packageName = "nice-try"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; + }; + }; + "nopt-1.0.10" = { + name = "nopt"; + packageName = "nopt"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; + sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; + }; + }; + "nopt-3.0.6" = { + name = "nopt"; + packageName = "nopt"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"; + sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; + }; + }; + "normalize-package-data-2.5.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; + }; + }; + "normalize-path-2.1.1" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + }; + }; + "normalize-path-3.0.0" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; + }; + }; + "now-and-later-2.0.1" = { + name = "now-and-later"; + packageName = "now-and-later"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz"; + sha512 = "KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ=="; + }; + }; + "npm-conf-1.1.3" = { + name = "npm-conf"; + packageName = "npm-conf"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz"; + sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "nw-0.36.4" = { + name = "nw"; + packageName = "nw"; + version = "0.36.4"; + src = fetchurl { + url = "https://registry.npmjs.org/nw/-/nw-0.36.4.tgz"; + sha512 = "/8z60bdfI4AeBAWdZxOtvVpdpxUrwcAm+1PxOAmoLnJyKG0aXQYSsX9fZPNcJvubX9hy9GkqFEEd0rXn4n/Ryg=="; + }; + }; + "nw-autoupdater-1.1.11" = { + name = "nw-autoupdater"; + packageName = "nw-autoupdater"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/nw-autoupdater/-/nw-autoupdater-1.1.11.tgz"; + sha512 = "kCDRDCRayjZSwE8VhIclUyDjkylzHz9JT2WK/45wFNcW/9y6zaR/fy+AG2V266YF4XWFEId9ZuK2M3nIBpm9iw=="; + }; + }; + "nw-dev-3.0.1" = { + name = "nw-dev"; + packageName = "nw-dev"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nw-dev/-/nw-dev-3.0.1.tgz"; + sha1 = "fcae540cd00cb1f225808c2ebd96842df0b780d2"; + }; + }; + "oauth-sign-0.9.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; + }; + }; + "object-assign-2.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz"; + sha1 = "43c36e5d569ff8e4816c4efa8be02d26967c18aa"; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "object-copy-0.1.0" = { + name = "object-copy"; + packageName = "object-copy"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + }; + "object-keys-1.1.1" = { + name = "object-keys"; + packageName = "object-keys"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; + }; + }; + "object-visit-1.0.1" = { + name = "object-visit"; + packageName = "object-visit"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + }; + "object.assign-4.1.2" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"; + sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; + }; + }; + "object.defaults-1.1.0" = { + name = "object.defaults"; + packageName = "object.defaults"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz"; + sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; + }; + }; + "object.map-1.0.1" = { + name = "object.map"; + packageName = "object.map"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz"; + sha1 = "cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"; + }; + }; + "object.omit-2.0.1" = { + name = "object.omit"; + packageName = "object.omit"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz"; + sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; + }; + }; + "object.pick-1.3.0" = { + name = "object.pick"; + packageName = "object.pick"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + }; + }; + "object.reduce-1.0.1" = { + name = "object.reduce"; + packageName = "object.reduce"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz"; + sha1 = "6fe348f2ac7fa0f95ca621226599096825bb03ad"; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "onetime-5.1.2" = { + name = "onetime"; + packageName = "onetime"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"; + sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; + }; + }; + "optionator-0.8.3" = { + name = "optionator"; + packageName = "optionator"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz"; + sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; + }; + }; + "ordered-read-streams-0.3.0" = { + name = "ordered-read-streams"; + packageName = "ordered-read-streams"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz"; + sha1 = "7137e69b3298bb342247a1bbee3881c80e2fd78b"; + }; + }; + "ordered-read-streams-1.0.1" = { + name = "ordered-read-streams"; + packageName = "ordered-read-streams"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz"; + sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e"; + }; + }; + "os-locale-1.4.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; + sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "p-limit-3.1.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"; + sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; + }; + }; + "p-locate-5.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz"; + sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="; + }; + }; + "pako-1.0.11" = { + name = "pako"; + packageName = "pako"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz"; + sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; + }; + }; + "parent-module-1.0.1" = { + name = "parent-module"; + packageName = "parent-module"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; + }; + }; + "parse-filepath-1.0.2" = { + name = "parse-filepath"; + packageName = "parse-filepath"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz"; + sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891"; + }; + }; + "parse-glob-3.0.4" = { + name = "parse-glob"; + packageName = "parse-glob"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz"; + sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; + }; + }; + "parse-json-2.2.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + }; + "parse-node-version-1.0.1" = { + name = "parse-node-version"; + packageName = "parse-node-version"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz"; + sha512 = "3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA=="; + }; + }; + "parse-passwd-1.0.0" = { + name = "parse-passwd"; + packageName = "parse-passwd"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; + sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; + }; + }; + "pascalcase-0.1.1" = { + name = "pascalcase"; + packageName = "pascalcase"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + }; + }; + "path-dirname-1.0.2" = { + name = "path-dirname"; + packageName = "path-dirname"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"; + sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + }; + }; + "path-exists-2.1.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; + sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + }; + }; + "path-exists-4.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "path-key-2.0.1" = { + name = "path-key"; + packageName = "path-key"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + }; + "path-parse-1.0.7" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; + }; + }; + "path-root-0.1.1" = { + name = "path-root"; + packageName = "path-root"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz"; + sha1 = "9a4a6814cac1c0cd73360a95f32083c8ea4745b7"; + }; + }; + "path-root-regex-0.1.2" = { + name = "path-root-regex"; + packageName = "path-root-regex"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz"; + sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"; + }; + }; + "path-type-1.1.0" = { + name = "path-type"; + packageName = "path-type"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; + sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; + }; + }; + "pathval-1.1.1" = { + name = "pathval"; + packageName = "pathval"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz"; + sha512 = "Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ=="; + }; + }; + "pend-1.2.0" = { + name = "pend"; + packageName = "pend"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; + sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + }; + }; + "performance-now-2.1.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + }; + "picomatch-2.3.0" = { + name = "picomatch"; + packageName = "picomatch"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz"; + sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="; + }; + }; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + }; + "pify-3.0.0" = { + name = "pify"; + packageName = "pify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + }; + "pinkie-2.0.4" = { + name = "pinkie"; + packageName = "pinkie"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + }; + "pinkie-promise-2.0.1" = { + name = "pinkie-promise"; + packageName = "pinkie-promise"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + }; + "posix-character-classes-0.1.1" = { + name = "posix-character-classes"; + packageName = "posix-character-classes"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + }; + "prelude-ls-1.1.2" = { + name = "prelude-ls"; + packageName = "prelude-ls"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + }; + "prepend-http-1.0.4" = { + name = "prepend-http"; + packageName = "prepend-http"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"; + sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + }; + }; + "preserve-0.2.0" = { + name = "preserve"; + packageName = "preserve"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"; + sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b"; + }; + }; + "pretty-hrtime-1.0.3" = { + name = "pretty-hrtime"; + packageName = "pretty-hrtime"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"; + sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1"; + }; + }; + "process-nextick-args-2.0.1" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + }; + }; + "progress-2.0.3" = { + name = "progress"; + packageName = "progress"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; + }; + }; + "proto-list-1.2.4" = { + name = "proto-list"; + packageName = "proto-list"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; + sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + }; + }; + "psl-1.8.0" = { + name = "psl"; + packageName = "psl"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; + }; + }; + "pump-2.0.1" = { + name = "pump"; + packageName = "pump"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"; + sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="; + }; + }; + "pumpify-1.5.1" = { + name = "pumpify"; + packageName = "pumpify"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz"; + sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ=="; + }; + }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; + "q-1.5.1" = { + name = "q"; + packageName = "q"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz"; + sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; + }; + }; + "qs-6.5.2" = { + name = "qs"; + packageName = "qs"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + }; + }; + "randomatic-3.1.1" = { + name = "randomatic"; + packageName = "randomatic"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz"; + sha512 = "TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw=="; + }; + }; + "randombytes-2.1.0" = { + name = "randombytes"; + packageName = "randombytes"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; + }; + }; + "read-all-stream-3.1.0" = { + name = "read-all-stream"; + packageName = "read-all-stream"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz"; + sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; + }; + }; + "read-pkg-1.1.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; + sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + }; + }; + "read-pkg-up-1.0.1" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; + sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + }; + }; + "readable-stream-1.0.34" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.0.34"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"; + sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; + }; + }; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + }; + "readable-stream-2.3.7" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + }; + }; + "readdirp-2.2.1" = { + name = "readdirp"; + packageName = "readdirp"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz"; + sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; + }; + }; + "readdirp-3.5.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz"; + sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ=="; + }; + }; + "rechoir-0.6.2" = { + name = "rechoir"; + packageName = "rechoir"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; + sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; + }; + }; + "regex-cache-0.4.4" = { + name = "regex-cache"; + packageName = "regex-cache"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz"; + sha512 = "nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ=="; + }; + }; + "regex-not-1.0.2" = { + name = "regex-not"; + packageName = "regex-not"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; + sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; + }; + }; + "regexpp-2.0.1" = { + name = "regexpp"; + packageName = "regexpp"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz"; + sha512 = "lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="; + }; + }; + "remove-bom-buffer-3.0.0" = { + name = "remove-bom-buffer"; + packageName = "remove-bom-buffer"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz"; + sha512 = "8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ=="; + }; + }; + "remove-bom-stream-1.2.0" = { + name = "remove-bom-stream"; + packageName = "remove-bom-stream"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz"; + sha1 = "05f1a593f16e42e1fb90ebf59de8e569525f9523"; + }; + }; + "remove-trailing-separator-1.1.0" = { + name = "remove-trailing-separator"; + packageName = "remove-trailing-separator"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + }; + }; + "repeat-element-1.1.4" = { + name = "repeat-element"; + packageName = "repeat-element"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz"; + sha512 = "LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ=="; + }; + }; + "repeat-string-1.6.1" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + }; + "replace-ext-0.0.1" = { + name = "replace-ext"; + packageName = "replace-ext"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"; + sha1 = "29bbd92078a739f0bcce2b4ee41e837953522924"; + }; + }; + "replace-ext-1.0.1" = { + name = "replace-ext"; + packageName = "replace-ext"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz"; + sha512 = "yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw=="; + }; + }; + "replace-homedir-1.0.0" = { + name = "replace-homedir"; + packageName = "replace-homedir"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz"; + sha1 = "e87f6d513b928dde808260c12be7fec6ff6e798c"; + }; + }; + "request-2.88.2" = { + name = "request"; + packageName = "request"; + version = "2.88.2"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; + }; + }; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + }; + "require-main-filename-1.0.1" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + }; + "resolve-1.20.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz"; + sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; + }; + }; + "resolve-dir-1.0.1" = { + name = "resolve-dir"; + packageName = "resolve-dir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"; + sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; + }; + }; + "resolve-from-4.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; + }; + }; + "resolve-options-1.1.0" = { + name = "resolve-options"; + packageName = "resolve-options"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz"; + sha1 = "32bb9e39c06d67338dc9378c0d6d6074566ad131"; + }; + }; + "resolve-url-0.2.1" = { + name = "resolve-url"; + packageName = "resolve-url"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + }; + "restore-cursor-3.1.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"; + sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; + }; + }; + "ret-0.1.15" = { + name = "ret"; + packageName = "ret"; + version = "0.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; + sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; + }; + }; + "rimraf-2.6.3" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz"; + sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; + }; + }; + "rimraf-2.7.1" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; + }; + }; + "run-async-2.4.1" = { + name = "run-async"; + packageName = "run-async"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"; + sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; + }; + }; + "rxjs-6.6.7" = { + name = "rxjs"; + packageName = "rxjs"; + version = "6.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz"; + sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safe-regex-1.1.0" = { + name = "safe-regex"; + packageName = "safe-regex"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "sax-1.2.4" = { + name = "sax"; + packageName = "sax"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; + }; + }; + "seek-bzip-1.0.6" = { + name = "seek-bzip"; + packageName = "seek-bzip"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz"; + sha512 = "e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ=="; + }; + }; + "selenium-webdriver-3.6.0" = { + name = "selenium-webdriver"; + packageName = "selenium-webdriver"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz"; + sha512 = "WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q=="; + }; + }; + "semver-5.7.1" = { + name = "semver"; + packageName = "semver"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + }; + "semver-6.3.0" = { + name = "semver"; + packageName = "semver"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; + }; + }; + "semver-greatest-satisfied-range-1.1.0" = { + name = "semver-greatest-satisfied-range"; + packageName = "semver-greatest-satisfied-range"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz"; + sha1 = "13e8c2658ab9691cb0cd71093240280d36f77a5b"; + }; + }; + "serialize-javascript-5.0.1" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; + sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; + "set-immediate-shim-1.0.1" = { + name = "set-immediate-shim"; + packageName = "set-immediate-shim"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"; + sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; + }; + }; + "set-value-2.0.1" = { + name = "set-value"; + packageName = "set-value"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz"; + sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="; + }; + }; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + }; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + }; + "signal-exit-3.0.3" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; + sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; + }; + }; + "slice-ansi-2.1.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz"; + sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="; + }; + }; + "snapdragon-0.8.2" = { + name = "snapdragon"; + packageName = "snapdragon"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"; + sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="; + }; + }; + "snapdragon-node-2.1.1" = { + name = "snapdragon-node"; + packageName = "snapdragon-node"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="; + }; + }; + "snapdragon-util-3.0.1" = { + name = "snapdragon-util"; + packageName = "snapdragon-util"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; + }; + }; + "source-map-0.5.7" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + }; + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + }; + }; + "source-map-resolve-0.5.3" = { + name = "source-map-resolve"; + packageName = "source-map-resolve"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; + }; + }; + "source-map-url-0.4.1" = { + name = "source-map-url"; + packageName = "source-map-url"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz"; + sha512 = "cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="; + }; + }; + "sparkles-1.0.1" = { + name = "sparkles"; + packageName = "sparkles"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz"; + sha512 = "dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw=="; + }; + }; + "spdx-correct-3.1.1" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w=="; + }; + }; + "spdx-exceptions-2.3.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; + }; + }; + "spdx-expression-parse-3.0.1" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; + }; + }; + "spdx-license-ids-3.0.10" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz"; + sha512 = "oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA=="; + }; + }; + "split-string-3.1.0" = { + name = "split-string"; + packageName = "split-string"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; + sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; + }; + }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; + "sshpk-1.16.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; + }; + }; + "stack-trace-0.0.10" = { + name = "stack-trace"; + packageName = "stack-trace"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"; + sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; + }; + }; + "stat-mode-0.2.2" = { + name = "stat-mode"; + packageName = "stat-mode"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz"; + sha1 = "e6c80b623123d7d80cf132ce538f346289072502"; + }; + }; + "static-extend-0.1.2" = { + name = "static-extend"; + packageName = "static-extend"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + }; + "stream-combiner2-1.1.1" = { + name = "stream-combiner2"; + packageName = "stream-combiner2"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz"; + sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; + }; + }; + "stream-exhaust-1.0.2" = { + name = "stream-exhaust"; + packageName = "stream-exhaust"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz"; + sha512 = "b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw=="; + }; + }; + "stream-shift-1.0.1" = { + name = "stream-shift"; + packageName = "stream-shift"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"; + sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "string-width-3.1.0" = { + name = "string-width"; + packageName = "string-width"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; + }; + }; + "string-width-4.2.2" = { + name = "string-width"; + packageName = "string-width"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz"; + sha512 = "XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA=="; + }; + }; + "string_decoder-0.10.31" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "strip-ansi-5.2.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; + }; + }; + "strip-ansi-6.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; + }; + }; + "strip-bom-2.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; + sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + }; + }; + "strip-bom-stream-1.0.0" = { + name = "strip-bom-stream"; + packageName = "strip-bom-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz"; + sha1 = "e7144398577d51a6bed0fa1994fa05f43fd988ee"; + }; + }; + "strip-bom-string-1.0.0" = { + name = "strip-bom-string"; + packageName = "strip-bom-string"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz"; + sha1 = "e5211e9224369fbb81d633a2f00044dc8cedad92"; + }; + }; + "strip-dirs-1.1.1" = { + name = "strip-dirs"; + packageName = "strip-dirs"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz"; + sha1 = "960bbd1287844f3975a4558aa103a8255e2456a0"; + }; + }; + "strip-dirs-2.1.0" = { + name = "strip-dirs"; + packageName = "strip-dirs"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz"; + sha512 = "JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g=="; + }; + }; + "strip-json-comments-3.1.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; + }; + }; + "strip-outer-1.0.1" = { + name = "strip-outer"; + packageName = "strip-outer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz"; + sha512 = "k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg=="; + }; + }; + "sum-up-1.0.3" = { + name = "sum-up"; + packageName = "sum-up"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sum-up/-/sum-up-1.0.3.tgz"; + sha1 = "1c661f667057f63bcb7875aa1438bc162525156e"; + }; + }; + "supports-color-2.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + }; + "supports-color-5.5.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + }; + "supports-color-7.2.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; + }; + }; + "supports-color-8.1.1" = { + name = "supports-color"; + packageName = "supports-color"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"; + sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; + }; + }; + "sver-compat-1.5.0" = { + name = "sver-compat"; + packageName = "sver-compat"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz"; + sha1 = "3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8"; + }; + }; + "table-5.4.6" = { + name = "table"; + packageName = "table"; + version = "5.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-5.4.6.tgz"; + sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; + }; + }; + "tar-stream-1.6.2" = { + name = "tar-stream"; + packageName = "tar-stream"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz"; + sha512 = "rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A=="; + }; + }; + "text-table-0.2.0" = { + name = "text-table"; + packageName = "text-table"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + }; + "through-2.3.8" = { + name = "through"; + packageName = "through"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + }; + "through2-0.6.5" = { + name = "through2"; + packageName = "through2"; + version = "0.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz"; + sha1 = "41ab9c67b29d57209071410e1d7a7a968cd3ad48"; + }; + }; + "through2-2.0.5" = { + name = "through2"; + packageName = "through2"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"; + sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; + }; + }; + "through2-filter-2.0.0" = { + name = "through2-filter"; + packageName = "through2-filter"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz"; + sha1 = "60bc55a0dacb76085db1f9dae99ab43f83d622ec"; + }; + }; + "through2-filter-3.0.0" = { + name = "through2-filter"; + packageName = "through2-filter"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz"; + sha512 = "jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA=="; + }; + }; + "time-stamp-1.1.0" = { + name = "time-stamp"; + packageName = "time-stamp"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz"; + sha1 = "764a5a11af50561921b133f3b44e618687e0f5c3"; + }; + }; + "timed-out-4.0.1" = { + name = "timed-out"; + packageName = "timed-out"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz"; + sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; + }; + }; + "timers-ext-0.1.7" = { + name = "timers-ext"; + packageName = "timers-ext"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz"; + sha512 = "b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ=="; + }; + }; + "tmp-0.0.30" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz"; + sha1 = "72419d4a8be7d6ce75148fd8b324e593a711c2ed"; + }; + }; + "tmp-0.0.33" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; + sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; + }; + }; + "to-absolute-glob-0.1.1" = { + name = "to-absolute-glob"; + packageName = "to-absolute-glob"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz"; + sha1 = "1cdfa472a9ef50c239ee66999b662ca0eb39937f"; + }; + }; + "to-absolute-glob-2.0.2" = { + name = "to-absolute-glob"; + packageName = "to-absolute-glob"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz"; + sha1 = "1865f43d9e74b0822db9f145b78cff7d0f7c849b"; + }; + }; + "to-buffer-1.1.1" = { + name = "to-buffer"; + packageName = "to-buffer"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz"; + sha512 = "lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="; + }; + }; + "to-object-path-0.3.0" = { + name = "to-object-path"; + packageName = "to-object-path"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + }; + "to-regex-3.0.2" = { + name = "to-regex"; + packageName = "to-regex"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; + sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; + }; + }; + "to-regex-range-2.1.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + }; + "to-regex-range-5.0.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; + }; + }; + "to-through-2.0.0" = { + name = "to-through"; + packageName = "to-through"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz"; + sha1 = "fc92adaba072647bc0b67d6b03664aa195093af6"; + }; + }; + "touch-0.0.3" = { + name = "touch"; + packageName = "touch"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/touch/-/touch-0.0.3.tgz"; + sha1 = "51aef3d449571d4f287a5d87c9c8b49181a0db1d"; + }; + }; + "tough-cookie-2.5.0" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; + }; + }; + "traverse-0.3.9" = { + name = "traverse"; + packageName = "traverse"; + version = "0.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"; + sha1 = "717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"; + }; + }; + "tree-kill-1.2.2" = { + name = "tree-kill"; + packageName = "tree-kill"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz"; + sha512 = "L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A=="; + }; + }; + "trim-repeated-1.0.0" = { + name = "trim-repeated"; + packageName = "trim-repeated"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz"; + sha1 = "e3646a2ea4e891312bf7eace6cfb05380bc01c21"; + }; + }; + "tslib-1.14.1" = { + name = "tslib"; + packageName = "tslib"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"; + sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; + }; + }; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + }; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + }; + "type-1.2.0" = { + name = "type"; + packageName = "type"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz"; + sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; + }; + }; + "type-2.5.0" = { + name = "type"; + packageName = "type"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type/-/type-2.5.0.tgz"; + sha512 = "180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw=="; + }; + }; + "type-check-0.3.2" = { + name = "type-check"; + packageName = "type-check"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + }; + "type-detect-4.0.8" = { + name = "type-detect"; + packageName = "type-detect"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"; + sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; + }; + }; + "type-fest-0.21.3" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.21.3"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"; + sha512 = "t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="; + }; + }; + "type-fest-0.8.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"; + sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; + }; + }; + "typedarray-0.0.6" = { + name = "typedarray"; + packageName = "typedarray"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + }; + "unbzip2-stream-1.4.3" = { + name = "unbzip2-stream"; + packageName = "unbzip2-stream"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz"; + sha512 = "mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg=="; + }; + }; + "unc-path-regex-0.1.2" = { + name = "unc-path-regex"; + packageName = "unc-path-regex"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; + sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; + }; + }; + "undertaker-1.3.0" = { + name = "undertaker"; + packageName = "undertaker"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz"; + sha512 = "/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg=="; + }; + }; + "undertaker-registry-1.0.1" = { + name = "undertaker-registry"; + packageName = "undertaker-registry"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz"; + sha1 = "5e4bda308e4a8a2ae584f9b9a4359a499825cc50"; + }; + }; + "union-value-1.0.1" = { + name = "union-value"; + packageName = "union-value"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz"; + sha512 = "tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg=="; + }; + }; + "unique-stream-2.3.1" = { + name = "unique-stream"; + packageName = "unique-stream"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz"; + sha512 = "2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A=="; + }; + }; + "universalify-0.1.2" = { + name = "universalify"; + packageName = "universalify"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; + }; + }; + "unset-value-1.0.0" = { + name = "unset-value"; + packageName = "unset-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + }; + "untildify-3.0.3" = { + name = "untildify"; + packageName = "untildify"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz"; + sha512 = "iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA=="; + }; + }; + "unzip-response-2.0.1" = { + name = "unzip-response"; + packageName = "unzip-response"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; + sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; + }; + }; + "upath-1.2.0" = { + name = "upath"; + packageName = "upath"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz"; + sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="; + }; + }; + "uri-js-4.4.1" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; + }; + }; + "urix-0.1.0" = { + name = "urix"; + packageName = "urix"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + }; + "url-parse-lax-1.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; + sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + }; + }; + "url-to-options-1.0.1" = { + name = "url-to-options"; + packageName = "url-to-options"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz"; + sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; + }; + }; + "use-3.1.1" = { + name = "use"; + packageName = "use"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz"; + sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "uuid-2.0.3" = { + name = "uuid"; + packageName = "uuid"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; + sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; + }; + }; + "uuid-3.4.0" = { + name = "uuid"; + packageName = "uuid"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; + }; + }; + "v8-compile-cache-2.3.0" = { + name = "v8-compile-cache"; + packageName = "v8-compile-cache"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; + }; + }; + "v8flags-3.2.0" = { + name = "v8flags"; + packageName = "v8flags"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz"; + sha512 = "mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg=="; + }; + }; + "vali-date-1.0.0" = { + name = "vali-date"; + packageName = "vali-date"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz"; + sha1 = "1b904a59609fb328ef078138420934f6b86709a6"; + }; + }; + "validate-npm-package-license-3.0.4" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; + }; + }; + "value-or-function-3.0.0" = { + name = "value-or-function"; + packageName = "value-or-function"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz"; + sha1 = "1c243a50b595c1be54a754bfece8563b9ff8d813"; + }; + }; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + }; + "vinyl-0.4.6" = { + name = "vinyl"; + packageName = "vinyl"; + version = "0.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz"; + sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847"; + }; + }; + "vinyl-1.2.0" = { + name = "vinyl"; + packageName = "vinyl"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz"; + sha1 = "5c88036cf565e5df05558bfc911f8656df218884"; + }; + }; + "vinyl-2.2.1" = { + name = "vinyl"; + packageName = "vinyl"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz"; + sha512 = "LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw=="; + }; + }; + "vinyl-assign-1.2.1" = { + name = "vinyl-assign"; + packageName = "vinyl-assign"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl-assign/-/vinyl-assign-1.2.1.tgz"; + sha1 = "4d198891b5515911d771a8cd9c5480a46a074a45"; + }; + }; + "vinyl-fs-2.4.4" = { + name = "vinyl-fs"; + packageName = "vinyl-fs"; + version = "2.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz"; + sha1 = "be6ff3270cb55dfd7d3063640de81f25d7532239"; + }; + }; + "vinyl-fs-3.0.3" = { + name = "vinyl-fs"; + packageName = "vinyl-fs"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz"; + sha512 = "vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng=="; + }; + }; + "vinyl-sourcemap-1.1.0" = { + name = "vinyl-sourcemap"; + packageName = "vinyl-sourcemap"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz"; + sha1 = "92a800593a38703a8cdb11d8b300ad4be63b3e16"; + }; + }; + "which-1.3.1" = { + name = "which"; + packageName = "which"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; + }; + }; + "which-2.0.2" = { + name = "which"; + packageName = "which"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; + }; + }; + "which-module-1.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"; + sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; + }; + }; + "wide-align-1.1.3" = { + name = "wide-align"; + packageName = "wide-align"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + }; + }; + "window-size-0.1.4" = { + name = "window-size"; + packageName = "window-size"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"; + sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"; + }; + }; + "winreg-1.2.4" = { + name = "winreg"; + packageName = "winreg"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/winreg/-/winreg-1.2.4.tgz"; + sha1 = "ba065629b7a925130e15779108cf540990e98d1b"; + }; + }; + "word-wrap-1.2.3" = { + name = "word-wrap"; + packageName = "word-wrap"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"; + sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; + }; + }; + "workerpool-6.1.0" = { + name = "workerpool"; + packageName = "workerpool"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz"; + sha512 = "toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg=="; + }; + }; + "wrap-ansi-2.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + }; + }; + "wrap-ansi-7.0.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "write-1.0.3" = { + name = "write"; + packageName = "write"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/write/-/write-1.0.3.tgz"; + sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig=="; + }; + }; + "xml2js-0.4.23" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.4.23"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz"; + sha512 = "ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug=="; + }; + }; + "xmlbuilder-11.0.1" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "11.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz"; + sha512 = "fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="; + }; + }; + "xtend-4.0.2" = { + name = "xtend"; + packageName = "xtend"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; + sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; + }; + }; + "y18n-3.2.2" = { + name = "y18n"; + packageName = "y18n"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz"; + sha512 = "uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ=="; + }; + }; + "y18n-5.0.8" = { + name = "y18n"; + packageName = "y18n"; + version = "5.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"; + sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; + }; + }; + "yargs-16.2.0" = { + name = "yargs"; + packageName = "yargs"; + version = "16.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"; + sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; + }; + }; + "yargs-3.32.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.32.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz"; + sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995"; + }; + }; + "yargs-7.1.2" = { + name = "yargs"; + packageName = "yargs"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz"; + sha512 = "ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA=="; + }; + }; + "yargs-parser-20.2.4" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "20.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz"; + sha512 = "WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA=="; + }; + }; + "yargs-parser-20.2.9" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "20.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"; + sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; + }; + }; + "yargs-parser-5.0.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz"; + sha512 = "wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA=="; + }; + }; + "yargs-unparser-2.0.0" = { + name = "yargs-unparser"; + packageName = "yargs-unparser"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz"; + sha512 = "7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA=="; + }; + }; + "yauzl-2.10.0" = { + name = "yauzl"; + packageName = "yauzl"; + version = "2.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"; + sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + }; + }; + "yocto-queue-0.1.0" = { + name = "yocto-queue"; + packageName = "yocto-queue"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"; + sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; + }; + }; + }; +in +{ + "onlykey-git://github.com/trustcrypto/OnlyKey-App.git#v5.3.3" = nodeEnv.buildNodePackage { + name = "OnlyKey"; + packageName = "OnlyKey"; + version = "5.3.3"; + src = fetchgit { + url = "git://github.com/trustcrypto/OnlyKey-App.git"; + rev = "0bd08ef5828d9493cd4c5f4909e9a4fc4c59a494"; + sha256 = "d2386369fd9d9b7d5ea5d389434848c33fa34e26d713d439e8e2f2e447237bb0"; + }; + dependencies = [ + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.9" + (sources."@babel/highlight-7.14.5" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."supports-color-5.5.0" + ]; + }) + (sources."@gulp-sourcemaps/identity-map-1.0.2" // { + dependencies = [ + sources."acorn-5.7.4" + sources."source-map-0.6.1" + sources."through2-2.0.5" + ]; + }) + (sources."@gulp-sourcemaps/map-sources-1.0.0" // { + dependencies = [ + sources."through2-2.0.5" + ]; + }) + sources."@ungap/promise-all-settled-1.1.2" + sources."abbrev-1.1.1" + sources."acorn-7.4.1" + sources."acorn-jsx-5.3.2" + sources."ajv-6.12.6" + sources."ansi-colors-1.1.0" + (sources."ansi-escapes-4.3.2" // { + dependencies = [ + sources."type-fest-0.21.3" + ]; + }) + sources."ansi-gray-0.1.1" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."ansi-wrap-0.1.0" + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."debug-2.6.9" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + sources."extend-shallow-3.0.2" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."is-extendable-1.0.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."kind-of-6.0.3" + sources."micromatch-3.1.10" + sources."ms-2.0.0" + ]; + }) + sources."append-buffer-1.0.2" + sources."applescript-1.0.0" + sources."archy-1.0.0" + sources."argparse-1.0.10" + sources."arr-diff-2.0.0" + sources."arr-filter-1.1.2" + sources."arr-flatten-1.1.0" + sources."arr-map-2.0.2" + sources."arr-union-3.1.0" + sources."array-each-1.0.1" + (sources."array-initial-1.1.0" // { + dependencies = [ + sources."is-number-4.0.0" + ]; + }) + (sources."array-last-1.3.0" // { + dependencies = [ + sources."is-number-4.0.0" + ]; + }) + sources."array-slice-1.1.0" + (sources."array-sort-1.0.0" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."array-unique-0.2.1" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."assertion-error-1.1.0" + sources."assign-symbols-1.0.0" + sources."astral-regex-1.0.0" + sources."async-done-1.3.2" + sources."async-each-1.0.3" + sources."async-settle-1.0.0" + sources."asynckit-0.4.0" + sources."atob-2.1.2" + sources."auto-launch-5.0.5" + sources."aws-sign2-0.7.0" + sources."aws4-1.11.0" + sources."bach-1.2.0" + sources."balanced-match-1.0.2" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) + sources."base64-js-1.5.1" + sources."bcrypt-pbkdf-1.0.2" + sources."binary-0.3.0" + sources."binary-extensions-1.13.1" + sources."bindings-1.5.0" + sources."bl-1.2.3" + sources."brace-expansion-1.1.11" + sources."braces-1.8.5" + sources."browser-stdout-1.3.1" + sources."buffer-5.7.1" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-crc32-0.2.13" + sources."buffer-equal-1.0.0" + sources."buffer-fill-1.0.0" + sources."buffer-from-1.1.2" + sources."buffer-to-vinyl-1.1.0" + sources."buffers-0.1.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."camelcase-2.1.1" + sources."capture-stack-trace-1.0.1" + sources."caseless-0.12.0" + sources."caw-2.0.1" + sources."chai-4.3.4" + sources."chai-as-promised-7.1.1" + sources."chainsaw-0.1.0" + sources."chalk-1.1.3" + sources."chardet-0.7.0" + sources."charm-0.1.2" + sources."check-error-1.0.2" + (sources."chokidar-2.1.8" // { + dependencies = [ + sources."array-unique-0.3.2" + sources."braces-2.3.2" + sources."fill-range-4.0.0" + sources."is-glob-4.0.1" + sources."is-number-3.0.0" + sources."isobject-3.0.1" + sources."normalize-path-3.0.0" + ]; + }) + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."isobject-3.0.1" + sources."kind-of-5.1.0" + ]; + }) + sources."cli-cursor-3.1.0" + sources."cli-width-3.0.0" + sources."cliui-3.2.0" + sources."clone-1.0.4" + sources."clone-buffer-1.0.0" + sources."clone-stats-0.0.1" + sources."cloneable-readable-1.1.3" + sources."code-point-at-1.1.0" + (sources."collection-map-1.0.0" // { + dependencies = [ + sources."for-own-1.0.0" + ]; + }) + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."color-support-1.1.3" + sources."combined-stream-1.0.8" + sources."commander-2.20.3" + sources."component-emitter-1.3.0" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."config-chain-1.1.13" + sources."convert-source-map-1.8.0" + sources."copy-descriptor-0.1.1" + (sources."copy-props-2.0.5" // { + dependencies = [ + sources."is-plain-object-5.0.0" + ]; + }) + sources."core-util-is-1.0.2" + sources."create-error-class-3.0.2" + sources."cross-spawn-6.0.5" + (sources."css-2.2.4" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."d-1.0.1" + sources."dashdash-1.14.1" + sources."debounce-1.2.1" + sources."debug-4.3.2" + (sources."debug-fabulous-1.1.0" // { + dependencies = [ + sources."debug-3.2.7" + sources."object-assign-4.1.1" + ]; + }) + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."decompress-3.0.0" + (sources."decompress-tar-3.1.0" // { + dependencies = [ + sources."clone-0.2.0" + sources."vinyl-0.4.6" + ]; + }) + (sources."decompress-tarbz2-3.1.0" // { + dependencies = [ + sources."clone-0.2.0" + sources."vinyl-0.4.6" + ]; + }) + (sources."decompress-targz-3.1.0" // { + dependencies = [ + sources."clone-0.2.0" + sources."vinyl-0.4.6" + ]; + }) + (sources."decompress-unzip-3.4.0" // { + dependencies = [ + sources."through2-2.0.5" + ]; + }) + (sources."decompress-zip-0.3.3" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) + sources."deep-eql-3.0.1" + sources."deep-is-0.1.3" + (sources."default-compare-1.0.0" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."default-resolution-2.0.0" + sources."define-properties-1.1.3" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."delayed-stream-1.0.0" + sources."detect-file-1.0.0" + sources."detect-newline-2.1.0" + sources."diff-5.0.0" + sources."doctrine-3.0.0" + (sources."download-5.0.3" // { + dependencies = [ + sources."decompress-4.2.1" + sources."decompress-tar-4.1.1" + (sources."decompress-tarbz2-4.1.1" // { + dependencies = [ + sources."file-type-6.2.0" + ]; + }) + sources."decompress-targz-4.1.1" + (sources."decompress-unzip-4.0.1" // { + dependencies = [ + sources."file-type-3.9.0" + sources."get-stream-2.3.1" + ]; + }) + sources."file-type-5.2.0" + sources."is-natural-number-4.0.1" + sources."object-assign-4.1.1" + sources."strip-dirs-2.1.0" + ]; + }) + sources."duplexer2-0.1.4" + sources."duplexer3-0.1.4" + sources."duplexify-3.7.1" + sources."each-props-1.3.2" + sources."ecc-jsbn-0.1.2" + sources."emoji-regex-8.0.0" + sources."end-of-stream-1.4.4" + sources."error-ex-1.3.2" + sources."es5-ext-0.10.53" + sources."es6-iterator-2.0.3" + sources."es6-symbol-3.1.3" + sources."es6-weak-map-2.0.3" + sources."escalade-3.1.1" + sources."escape-string-regexp-1.0.5" + (sources."eslint-6.8.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."glob-parent-5.1.2" + sources."is-glob-4.0.1" + sources."semver-6.3.0" + sources."strip-ansi-5.2.0" + sources."supports-color-5.5.0" + ]; + }) + sources."eslint-scope-5.1.1" + sources."eslint-utils-1.4.3" + sources."eslint-visitor-keys-1.3.0" + sources."espree-6.2.1" + sources."esprima-4.0.1" + (sources."esquery-1.4.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."event-emitter-0.3.5" + sources."expand-brackets-0.1.5" + sources."expand-range-1.8.2" + sources."expand-tilde-2.0.2" + (sources."ext-1.4.0" // { + dependencies = [ + sources."type-2.5.0" + ]; + }) + sources."extend-3.0.2" + sources."extend-shallow-2.0.1" + sources."external-editor-3.1.0" + (sources."extglob-0.3.2" // { + dependencies = [ + sources."is-extglob-1.0.0" + ]; + }) + sources."extsprintf-1.3.0" + sources."fancy-log-1.3.3" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."fd-slicer-1.1.0" + sources."figures-3.2.0" + sources."file-entry-cache-5.0.1" + sources."file-exists-2.0.0" + sources."file-type-3.9.0" + sources."file-uri-to-path-1.0.0" + sources."filename-regex-2.0.1" + sources."filename-reserved-regex-2.0.0" + sources."filenamify-2.1.0" + sources."fill-range-2.2.4" + sources."find-up-1.1.2" + (sources."findup-sync-3.0.0" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."debug-2.6.9" + sources."define-property-1.0.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + sources."extend-shallow-3.0.2" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."is-extendable-1.0.1" + sources."is-glob-4.0.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."kind-of-6.0.3" + sources."micromatch-3.1.10" + sources."ms-2.0.0" + ]; + }) + sources."fined-1.2.0" + sources."first-chunk-stream-1.0.0" + sources."flagged-respawn-1.0.1" + sources."flat-5.0.2" + (sources."flat-cache-2.0.1" // { + dependencies = [ + sources."glob-7.1.7" + sources."rimraf-2.6.3" + ]; + }) + sources."flatted-2.0.2" + sources."flush-write-stream-1.1.1" + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."fragment-cache-0.2.1" + sources."fs-constants-1.0.0" + sources."fs-extra-7.0.1" + sources."fs-jetpack-4.1.1" + (sources."fs-mkdirp-stream-1.0.0" // { + dependencies = [ + sources."through2-2.0.5" + ]; + }) + sources."fs.realpath-1.0.0" + sources."fsevents-1.2.13" + sources."function-bind-1.1.1" + sources."functional-red-black-tree-1.0.1" + sources."get-caller-file-1.0.3" + sources."get-func-name-2.0.0" + sources."get-intrinsic-1.1.1" + sources."get-proxy-2.1.0" + sources."get-stdin-4.0.1" + sources."get-stream-3.0.0" + sources."get-value-2.0.6" + sources."getpass-0.1.7" + sources."glob-5.0.15" + (sources."glob-base-0.3.0" // { + dependencies = [ + sources."glob-parent-2.0.0" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + ]; + }) + sources."glob-parent-3.1.0" + sources."glob-stream-5.3.5" + (sources."glob-watcher-5.0.5" // { + dependencies = [ + sources."normalize-path-3.0.0" + ]; + }) + sources."global-modules-1.0.0" + sources."global-prefix-1.0.2" + sources."globals-12.4.0" + sources."glogg-1.0.2" + sources."got-6.7.1" + sources."graceful-fs-4.2.8" + sources."growl-1.10.5" + (sources."gulp-4.0.2" // { + dependencies = [ + sources."clone-2.1.2" + sources."clone-stats-1.0.0" + sources."glob-7.1.7" + sources."glob-stream-6.1.0" + sources."is-absolute-1.0.0" + sources."is-relative-1.0.0" + sources."is-valid-glob-1.0.0" + sources."ordered-read-streams-1.0.1" + sources."replace-ext-1.0.1" + sources."through2-2.0.5" + sources."to-absolute-glob-2.0.2" + sources."vinyl-2.2.1" + sources."vinyl-fs-3.0.3" + ]; + }) + (sources."gulp-cli-2.3.0" // { + dependencies = [ + sources."camelcase-3.0.0" + sources."isobject-3.0.1" + sources."yargs-7.1.2" + ]; + }) + (sources."gulp-sourcemaps-2.6.5" // { + dependencies = [ + sources."acorn-5.7.4" + sources."source-map-0.6.1" + sources."through2-2.0.5" + ]; + }) + sources."gulplog-1.0.0" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."has-1.0.3" + sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" + sources."has-symbol-support-x-1.4.2" + sources."has-symbols-1.0.2" + sources."has-to-string-tag-x-1.4.1" + (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" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + sources."he-1.2.0" + sources."homedir-polyfill-1.0.3" + sources."hosted-git-info-2.8.9" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" + sources."ignore-4.0.6" + sources."immediate-3.0.6" + sources."import-fresh-3.3.0" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.8" + (sources."inquirer-7.3.3" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."interpret-1.4.0" + sources."invert-kv-1.0.0" + sources."is-absolute-0.1.7" + (sources."is-accessor-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.3" + ]; + }) + sources."is-arrayish-0.2.1" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-bzip2-1.0.0" + sources."is-core-module-2.6.0" + (sources."is-data-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.3" + ]; + }) + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."kind-of-6.0.3" + ]; + }) + sources."is-dotfile-1.0.3" + sources."is-equal-shallow-0.1.3" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."is-glob-3.1.0" + sources."is-gzip-1.0.0" + sources."is-natural-number-2.1.1" + sources."is-negated-glob-1.0.0" + sources."is-number-2.1.0" + sources."is-object-1.0.2" + sources."is-plain-obj-2.1.0" + (sources."is-plain-object-2.0.4" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."is-posix-bracket-0.1.1" + sources."is-primitive-2.0.0" + sources."is-promise-2.2.2" + sources."is-redirect-1.0.0" + sources."is-relative-0.1.3" + sources."is-retry-allowed-1.2.0" + sources."is-stream-1.1.0" + sources."is-tar-1.0.0" + sources."is-typedarray-1.0.0" + sources."is-unc-path-1.0.0" + sources."is-utf8-0.2.1" + sources."is-valid-glob-0.3.0" + sources."is-windows-1.0.2" + sources."is-zip-1.0.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-2.1.0" + 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."json-10.0.0" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-4.0.0" + sources."jsprim-1.4.1" + sources."jszip-3.7.1" + sources."just-debounce-1.1.0" + sources."kind-of-3.2.2" + sources."last-run-1.1.1" + sources."lazystream-1.0.0" + sources."lcid-1.0.0" + sources."lead-1.0.0" + sources."levn-0.3.0" + sources."lie-3.3.0" + sources."liftoff-3.1.0" + sources."load-json-file-1.1.0" + sources."locate-path-6.0.0" + sources."lodash-4.17.21" + sources."lodash.isequal-4.5.0" + (sources."log-symbols-4.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."lowercase-keys-1.0.1" + sources."lru-queue-0.1.0" + (sources."make-dir-1.3.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + (sources."make-iterator-1.0.1" // { + dependencies = [ + sources."kind-of-6.0.3" + ]; + }) + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + (sources."matchdep-2.0.0" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."debug-2.6.9" + sources."define-property-1.0.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + sources."extend-shallow-3.0.2" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."findup-sync-2.0.0" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."is-extendable-1.0.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."kind-of-6.0.3" + sources."micromatch-3.1.10" + sources."ms-2.0.0" + ]; + }) + sources."math-random-1.0.4" + (sources."memoizee-0.4.15" // { + dependencies = [ + sources."next-tick-1.1.0" + ]; + }) + sources."merge-1.2.1" + sources."merge-stream-1.0.1" + (sources."micromatch-2.3.11" // { + dependencies = [ + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + ]; + }) + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" + sources."mimic-fn-2.1.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-0.5.5" + sources."mkpath-0.1.0" + (sources."mocha-8.4.0" // { + dependencies = [ + sources."ansi-colors-4.1.1" + sources."anymatch-3.1.2" + sources."argparse-2.0.1" + sources."binary-extensions-2.2.0" + sources."braces-3.0.2" + sources."chokidar-3.5.1" + (sources."debug-4.3.1" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) + sources."escape-string-regexp-4.0.0" + sources."fill-range-7.0.1" + sources."find-up-5.0.0" + sources."fsevents-2.3.2" + sources."glob-7.1.6" + sources."glob-parent-5.1.2" + sources."has-flag-4.0.0" + sources."is-binary-path-2.1.0" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."js-yaml-4.0.0" + sources."ms-2.1.3" + sources."normalize-path-3.0.0" + sources."path-exists-4.0.0" + sources."readdirp-3.5.0" + sources."supports-color-8.1.1" + sources."to-regex-range-5.0.1" + sources."which-2.0.2" + sources."yargs-parser-20.2.4" + ]; + }) + sources."ms-2.1.2" + sources."multimeter-0.1.1" + sources."mute-stdout-1.0.1" + sources."mute-stream-0.0.8" + sources."nan-2.15.0" + sources."nanoid-3.1.20" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + sources."kind-of-6.0.3" + ]; + }) + sources."natural-compare-1.4.0" + sources."next-tick-1.0.0" + sources."nice-try-1.0.5" + sources."nopt-3.0.6" + sources."normalize-package-data-2.5.0" + sources."normalize-path-2.1.1" + sources."now-and-later-2.0.1" + (sources."npm-conf-1.1.3" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."number-is-nan-1.0.1" + (sources."nw-0.36.4" // { + dependencies = [ + sources."yargs-3.32.0" + ]; + }) + (sources."nw-autoupdater-1.1.11" // { + dependencies = [ + sources."decompress-4.2.1" + sources."decompress-tar-4.1.1" + (sources."decompress-tarbz2-4.1.1" // { + dependencies = [ + sources."file-type-6.2.0" + ]; + }) + sources."decompress-targz-4.1.1" + (sources."decompress-unzip-4.0.1" // { + dependencies = [ + sources."file-type-3.9.0" + ]; + }) + sources."file-type-5.2.0" + sources."get-stream-2.3.1" + sources."is-natural-number-4.0.1" + sources."object-assign-4.1.1" + sources."strip-dirs-2.1.0" + ]; + }) + (sources."nw-dev-3.0.1" // { + dependencies = [ + sources."anymatch-1.3.2" + sources."chokidar-1.7.0" + sources."glob-parent-2.0.0" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + ]; + }) + sources."oauth-sign-0.9.0" + sources."object-assign-2.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + ]; + }) + sources."object-keys-1.1.1" + (sources."object-visit-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."object.assign-4.1.2" + (sources."object.defaults-1.1.0" // { + dependencies = [ + sources."for-own-1.0.0" + sources."isobject-3.0.1" + ]; + }) + (sources."object.map-1.0.1" // { + dependencies = [ + sources."for-own-1.0.0" + ]; + }) + sources."object.omit-2.0.1" + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + (sources."object.reduce-1.0.1" // { + dependencies = [ + sources."for-own-1.0.0" + ]; + }) + sources."once-1.4.0" + sources."onetime-5.1.2" + sources."optionator-0.8.3" + sources."ordered-read-streams-0.3.0" + sources."os-locale-1.4.0" + sources."os-tmpdir-1.0.2" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + sources."pako-1.0.11" + sources."parent-module-1.0.1" + (sources."parse-filepath-1.0.2" // { + dependencies = [ + sources."is-absolute-1.0.0" + sources."is-relative-1.0.0" + ]; + }) + (sources."parse-glob-3.0.4" // { + dependencies = [ + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + ]; + }) + sources."parse-json-2.2.0" + sources."parse-node-version-1.0.1" + sources."parse-passwd-1.0.0" + sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" + sources."path-exists-2.1.0" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."path-parse-1.0.7" + sources."path-root-0.1.1" + sources."path-root-regex-0.1.2" + sources."path-type-1.1.0" + sources."pathval-1.1.1" + sources."pend-1.2.0" + sources."performance-now-2.1.0" + sources."picomatch-2.3.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."posix-character-classes-0.1.1" + sources."prelude-ls-1.1.2" + sources."prepend-http-1.0.4" + sources."preserve-0.2.0" + sources."pretty-hrtime-1.0.3" + sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" + sources."proto-list-1.2.4" + sources."psl-1.8.0" + sources."pump-2.0.1" + sources."pumpify-1.5.1" + sources."punycode-2.1.1" + sources."q-1.5.1" + sources."qs-6.5.2" + (sources."randomatic-3.1.1" // { + dependencies = [ + sources."is-number-4.0.0" + sources."kind-of-6.0.3" + ]; + }) + sources."randombytes-2.1.0" + sources."read-all-stream-3.1.0" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.7" + (sources."readdirp-2.2.1" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."debug-2.6.9" + sources."define-property-1.0.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + sources."extend-shallow-3.0.2" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."is-extendable-1.0.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."kind-of-6.0.3" + sources."micromatch-3.1.10" + sources."ms-2.0.0" + ]; + }) + sources."rechoir-0.6.2" + sources."regex-cache-0.4.4" + (sources."regex-not-1.0.2" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + ]; + }) + sources."regexpp-2.0.1" + sources."remove-bom-buffer-3.0.0" + (sources."remove-bom-stream-1.2.0" // { + dependencies = [ + sources."through2-2.0.5" + ]; + }) + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.4" + sources."repeat-string-1.6.1" + sources."replace-ext-0.0.1" + (sources."replace-homedir-1.0.0" // { + dependencies = [ + sources."is-absolute-1.0.0" + sources."is-relative-1.0.0" + ]; + }) + (sources."request-2.88.2" // { + dependencies = [ + sources."uuid-3.4.0" + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-1.20.0" + sources."resolve-dir-1.0.1" + sources."resolve-from-4.0.0" + sources."resolve-options-1.1.0" + sources."resolve-url-0.2.1" + sources."restore-cursor-3.1.0" + sources."ret-0.1.15" + (sources."rimraf-2.7.1" // { + dependencies = [ + sources."glob-7.1.7" + ]; + }) + sources."run-async-2.4.1" + sources."rxjs-6.6.7" + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."seek-bzip-1.0.6" + (sources."selenium-webdriver-3.6.0" // { + dependencies = [ + sources."tmp-0.0.30" + ]; + }) + sources."semver-5.7.1" + sources."semver-greatest-satisfied-range-1.1.0" + sources."serialize-javascript-5.0.1" + sources."set-blocking-2.0.0" + sources."set-immediate-shim-1.0.1" + sources."set-value-2.0.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.3" + (sources."slice-ansi-2.1.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."is-fullwidth-code-point-2.0.0" + ]; + }) + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) + sources."snapdragon-util-3.0.1" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.3" + sources."source-map-url-0.4.1" + sources."sparkles-1.0.1" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.10" + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + ]; + }) + sources."sprintf-js-1.0.3" + sources."sshpk-1.16.1" + sources."stack-trace-0.0.10" + sources."stat-mode-0.2.2" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."stream-combiner2-1.1.1" + sources."stream-exhaust-1.0.2" + sources."stream-shift-1.0.1" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."strip-bom-stream-1.0.0" + sources."strip-bom-string-1.0.0" + sources."strip-dirs-1.1.1" + sources."strip-json-comments-3.1.1" + sources."strip-outer-1.0.1" + sources."sum-up-1.0.3" + sources."supports-color-2.0.0" + sources."sver-compat-1.5.0" + (sources."table-5.4.6" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."tar-stream-1.6.2" + sources."text-table-0.2.0" + sources."through-2.3.8" + (sources."through2-0.6.5" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.0.34" + sources."string_decoder-0.10.31" + ]; + }) + (sources."through2-filter-2.0.0" // { + dependencies = [ + sources."through2-2.0.5" + ]; + }) + sources."time-stamp-1.1.0" + sources."timed-out-4.0.1" + sources."timers-ext-0.1.7" + sources."tmp-0.0.33" + sources."to-absolute-glob-0.1.1" + sources."to-buffer-1.1.1" + sources."to-object-path-0.3.0" + (sources."to-regex-3.0.2" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + ]; + }) + (sources."to-regex-range-2.1.1" // { + dependencies = [ + sources."is-number-3.0.0" + ]; + }) + (sources."to-through-2.0.0" // { + dependencies = [ + sources."through2-2.0.5" + ]; + }) + (sources."touch-0.0.3" // { + dependencies = [ + sources."nopt-1.0.10" + ]; + }) + sources."tough-cookie-2.5.0" + sources."traverse-0.3.9" + sources."tree-kill-1.2.2" + sources."trim-repeated-1.0.0" + sources."tslib-1.14.1" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-1.2.0" + sources."type-check-0.3.2" + sources."type-detect-4.0.8" + sources."type-fest-0.8.1" + sources."typedarray-0.0.6" + sources."unbzip2-stream-1.4.3" + sources."unc-path-regex-0.1.2" + (sources."undertaker-1.3.0" // { + dependencies = [ + sources."fast-levenshtein-1.1.4" + ]; + }) + sources."undertaker-registry-1.0.1" + sources."union-value-1.0.1" + (sources."unique-stream-2.3.1" // { + dependencies = [ + sources."through2-2.0.5" + sources."through2-filter-3.0.0" + ]; + }) + sources."universalify-0.1.2" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + sources."isobject-3.0.1" + ]; + }) + sources."untildify-3.0.3" + sources."unzip-response-2.0.1" + sources."upath-1.2.0" + sources."uri-js-4.4.1" + sources."urix-0.1.0" + sources."url-parse-lax-1.0.0" + sources."url-to-options-1.0.1" + sources."use-3.1.1" + sources."util-deprecate-1.0.2" + sources."uuid-2.0.3" + sources."v8-compile-cache-2.3.0" + sources."v8flags-3.2.0" + sources."vali-date-1.0.0" + sources."validate-npm-package-license-3.0.4" + sources."value-or-function-3.0.0" + sources."verror-1.10.0" + sources."vinyl-1.2.0" + (sources."vinyl-assign-1.2.1" // { + dependencies = [ + sources."object-assign-4.1.1" + ]; + }) + (sources."vinyl-fs-2.4.4" // { + dependencies = [ + sources."gulp-sourcemaps-1.6.0" + sources."object-assign-4.1.1" + sources."through2-2.0.5" + ]; + }) + (sources."vinyl-sourcemap-1.1.0" // { + dependencies = [ + sources."clone-2.1.2" + sources."clone-stats-1.0.0" + sources."replace-ext-1.0.1" + sources."vinyl-2.2.1" + ]; + }) + sources."which-1.3.1" + sources."which-module-1.0.0" + sources."wide-align-1.1.3" + sources."window-size-0.1.4" + sources."winreg-1.2.4" + sources."word-wrap-1.2.3" + sources."workerpool-6.1.0" + sources."wrap-ansi-2.1.0" + sources."wrappy-1.0.2" + sources."write-1.0.3" + sources."xml2js-0.4.23" + sources."xmlbuilder-11.0.1" + sources."xtend-4.0.2" + sources."y18n-3.2.2" + (sources."yargs-16.2.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."cliui-7.0.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."get-caller-file-2.0.5" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + sources."wrap-ansi-7.0.0" + sources."y18n-5.0.8" + sources."yargs-parser-20.2.9" + ]; + }) + (sources."yargs-parser-5.0.1" // { + dependencies = [ + sources."camelcase-3.0.0" + ]; + }) + (sources."yargs-unparser-2.0.0" // { + dependencies = [ + sources."camelcase-6.2.0" + sources."decamelize-4.0.0" + ]; + }) + sources."yauzl-2.10.0" + sources."yocto-queue-0.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Setup and configure OnlyKey"; + homepage = "https://github.com/trustcrypto/OnlyKey-App#readme"; + license = "Apache-2.0"; + }; + production = false; + bypassCache = true; + reconstructLock = true; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/onlykey/onlykey.nix b/third_party/nixpkgs/pkgs/tools/security/onlykey/onlykey.nix new file mode 100644 index 0000000000..6fb86dfd79 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/onlykey/onlykey.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.9.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + +let + nodeEnv = import ../../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages.nix { + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; + inherit nodeEnv; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/onlykey/package.json b/third_party/nixpkgs/pkgs/tools/security/onlykey/package.json new file mode 100644 index 0000000000..d9a1a72c42 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/onlykey/package.json @@ -0,0 +1,3 @@ +[ + {"onlykey": "git://github.com/trustcrypto/OnlyKey-App.git#v5.3.3"} +] diff --git a/third_party/nixpkgs/pkgs/tools/security/otpauth/default.nix b/third_party/nixpkgs/pkgs/tools/security/otpauth/default.nix new file mode 100644 index 0000000000..66e6dab568 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/otpauth/default.nix @@ -0,0 +1,27 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + pname = "otpauth"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "dim13"; + repo = "otpauth"; + rev = "v${version}"; + sha256 = "199kh544kx4cbsczc9anmciczi738gdc5g518ybb05h49vlb51dp"; + }; + + runVend = true; + vendorSha256 = "1762cchqydgsf94y05dwxcrajvjr64ayi5xk1svn1xissyc7vgpv"; + doCheck = true; + + meta = with lib; { + description = "Google Authenticator migration decoder"; + homepage = "https://github.com/dim13/otpauth"; + license = licenses.isc; + maintainers = with maintainers; [ ereslibre ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/pamtester/default.nix b/third_party/nixpkgs/pkgs/tools/security/pamtester/default.nix index 1944e5187d..face92a00a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pamtester/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pamtester/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pam }: stdenv.mkDerivation rec { - name = "pamtester-0.1.2"; + pname = "pamtester"; + version = "0.1.2"; src = fetchurl { - url = "mirror://sourceforge/pamtester/${name}.tar.gz"; + url = "mirror://sourceforge/pamtester/pamtester-${version}.tar.gz"; sha256 = "1mdj1wj0adcnx354fs17928yn2xfr1hj5mfraq282dagi873sqw3"; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/pwgen/default.nix b/third_party/nixpkgs/pkgs/tools/security/pwgen/default.nix index c84b9472e9..fc410f1984 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pwgen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pwgen/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, autoreconfHook}: -stdenv.mkDerivation { - name = "pwgen-2.08"; +stdenv.mkDerivation rec { + pname = "pwgen"; + version = "2.08"; src = fetchurl { - url = "https://github.com/tytso/pwgen/archive/v2.08.tar.gz"; + url = "https://github.com/tytso/pwgen/archive/v${version}.tar.gz"; sha256 = "8d6e94f28655e61d6126290e3eafad4d17d7fba0d0d354239522a740a270bb2f"; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/safe/default.nix b/third_party/nixpkgs/pkgs/tools/security/safe/default.nix index 503cfbd9e8..747528b0ac 100644 --- a/third_party/nixpkgs/pkgs/tools/security/safe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/safe/default.nix @@ -18,9 +18,9 @@ buildGoPackage rec { goPackagePath = "github.com/starkandwayne/safe"; - preBuild = '' - buildFlagsArray+=("-ldflags" "-X main.Version=${version}") - ''; + ldflags = [ + "-X main.Version=${version}" + ]; meta = with lib; { description = "A Vault CLI"; diff --git a/third_party/nixpkgs/pkgs/tools/security/super/default.nix b/third_party/nixpkgs/pkgs/tools/security/super/default.nix index f8e78c6697..d87580975f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/super/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/super/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "super-3.30.0"; + pname = "super"; + version = "3.30.0"; src = fetchurl { - name = "${name}.tar.gz"; - url = "https://www.ucolick.org/~will/RUE/super/${name}-tar.gz"; + name = "super-${version}.tar.gz"; + url = "https://www.ucolick.org/~will/RUE/super/super-${version}-tar.gz"; sha256 = "0k476f83w7f45y9jpyxwr00ikv1vhjiq0c26fgjch9hnv18icvwy"; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/teler/default.nix b/third_party/nixpkgs/pkgs/tools/security/teler/default.nix index a4bcc87eed..ffcab3a418 100644 --- a/third_party/nixpkgs/pkgs/tools/security/teler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/teler/default.nix @@ -16,9 +16,9 @@ buildGoModule rec { vendorSha256 = "sha256-TQjwPem+RMuoF5T02CL/CTvBS6W7Q786gTvYUFIvxjE="; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X ktbs.dev/teler/common.Version=${version}") - ''; + ldflags = [ + "-s" "-w" "-X ktbs.dev/teler/common.Version=${version}" + ]; # test require internet access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix b/third_party/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix index 52964b620d..25a781d8fd 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "tpm2-tools"; - version = "5.0"; + version = "5.1.1"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-4bkH/imHdigFLgithO68bD92RtKVBe1IYulhYqjJG6E="; + sha256 = "sha256-VQCBD3r5mTkbq7EyFtdYQ77p8/nRVE/u1eUD2AEXSjs="; }; nativeBuildInputs = [ pandoc pkg-config makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/acct/default.nix b/third_party/nixpkgs/pkgs/tools/system/acct/default.nix index fbe396f1fd..9a363eb870 100644 --- a/third_party/nixpkgs/pkgs/tools/system/acct/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/acct/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "acct-6.6.4"; + pname = "acct"; + version = "6.6.4"; src = fetchurl { - url = "mirror://gnu/acct/${name}.tar.gz"; + url = "mirror://gnu/acct/acct-${version}.tar.gz"; sha256 = "0gv6m8giazshvgpvwbng98chpas09myyfw1zr2y7hqxib0mvy5ac"; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/actkbd/default.nix b/third_party/nixpkgs/pkgs/tools/system/actkbd/default.nix index ac2fb338d3..61be7e5a4a 100644 --- a/third_party/nixpkgs/pkgs/tools/system/actkbd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/actkbd/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "actkbd-0.2.8"; + pname = "actkbd"; + version = "0.2.8"; src = fetchurl { - url = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/${name}.tar.bz2"; + url = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/actkbd-${version}.tar.bz2"; sha256 = "1ipb7k5q7k7p54is96ij2n74jfa6xc0llb9lpjwxhsqviqxn9slm"; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/bar/default.nix b/third_party/nixpkgs/pkgs/tools/system/bar/default.nix index 79bb3f79a9..ddea8881ca 100644 --- a/third_party/nixpkgs/pkgs/tools/system/bar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/bar/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "bar-1.11.1"; +stdenv.mkDerivation rec { + pname = "bar"; + version = "1.11.1"; src = fetchurl { - url = "mirror://sourceforge/project/clpbar/clpbar/bar-1.11.1/bar_1.11.1.tar.gz"; + url = "mirror://sourceforge/project/clpbar/clpbar/bar-${version}/bar_${version}.tar.gz"; sha256 = "00v5cb6vzizyyhflgr62d3k8dqc0rg6wdgfyyk11c0s0r32mw3zs"; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/battop/battery.patch b/third_party/nixpkgs/pkgs/tools/system/battop/battery.patch new file mode 100644 index 0000000000..218359d904 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/battop/battery.patch @@ -0,0 +1,588 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 57ee609..d156cd2 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,430 +1,429 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. ++version = 3 ++ + [[package]] + name = "autocfg" + version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" + + [[package]] + name = "battery" +-version = "0.7.4" ++version = "0.7.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b4b624268937c0e0a3edb7c27843f9e547c320d730c610d3b8e6e8e95b2026e4" + dependencies = [ +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", +- "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "nix 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "uom 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 1.0.0", ++ "core-foundation", ++ "lazycell", ++ "libc", ++ "mach", ++ "nix", ++ "num-traits", ++ "uom", ++ "winapi", + ] + + [[package]] + name = "battop" + version = "0.2.4" + dependencies = [ +- "battery 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "stderrlog 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "tui 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "battery", ++ "humantime", ++ "itertools", ++ "log", ++ "stderrlog", ++ "structopt", ++ "termion", ++ "tui", + ] + + [[package]] + name = "bitflags" +-version = "1.0.4" ++version = "1.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + + [[package]] + name = "cassowary" + version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + + [[package]] + name = "cc" + version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" + + [[package]] + name = "cfg-if" + version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "chrono" + version = "0.4.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" + dependencies = [ +- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-integer", ++ "num-traits", ++ "time", + ] + + [[package]] + name = "clap" + version = "2.33.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" + dependencies = [ +- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "textwrap", ++ "unicode-width", + ] + + [[package]] + name = "core-foundation" +-version = "0.6.4" ++version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" + dependencies = [ +- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys", ++ "libc", + ] + + [[package]] + name = "core-foundation-sys" +-version = "0.6.2" ++version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" + + [[package]] + name = "either" + version = "1.5.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" + + [[package]] + name = "heck" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" + dependencies = [ +- "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-segmentation", + ] + + [[package]] + name = "humantime" + version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" + dependencies = [ +- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quick-error", + ] + + [[package]] + name = "itertools" + version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" + dependencies = [ +- "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "either", + ] + + [[package]] + name = "lazy_static" + version = "1.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" + + [[package]] + name = "lazycell" +-version = "1.2.1" ++version = "1.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + + [[package]] + name = "libc" +-version = "0.2.58" ++version = "0.2.98" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" + + [[package]] + name = "log" + version = "0.4.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" + dependencies = [ +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9", + ] + + [[package]] + name = "mach" +-version = "0.2.3" ++version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" + dependencies = [ +- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", + ] + + [[package]] + name = "nix" +-version = "0.14.0" ++version = "0.19.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2" + dependencies = [ +- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", +- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "cc", ++ "cfg-if 1.0.0", ++ "libc", + ] + + [[package]] + name = "num-integer" + version = "0.1.41" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" + dependencies = [ +- "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", ++ "num-traits", + ] + + [[package]] + name = "num-traits" + version = "0.2.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" + dependencies = [ +- "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", + ] + + [[package]] + name = "numtoa" + version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" + + [[package]] + name = "proc-macro2" + version = "0.4.30" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" + dependencies = [ +- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid", + ] + + [[package]] + name = "quick-error" + version = "1.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" + + [[package]] + name = "quote" + version = "0.6.12" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" + dependencies = [ +- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", + ] + + [[package]] + name = "redox_syscall" + version = "0.1.54" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" + + [[package]] + name = "redox_termios" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" + dependencies = [ +- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall", + ] + + [[package]] + name = "stderrlog" + version = "0.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "61dc66b7ae72b65636dbf36326f9638fb3ba27871bb737a62e2c309b87d91b70" + dependencies = [ +- "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono", ++ "log", ++ "termcolor", ++ "thread_local", + ] + + [[package]] + name = "structopt" + version = "0.2.17" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c767a8971f53d7324583085deee2e230903be09e52fb27df9af94c5cb2b43c31" + dependencies = [ +- "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clap", ++ "structopt-derive", + ] + + [[package]] + name = "structopt-derive" + version = "0.2.17" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c57a30c87454ced2186f62f940e981746e8cbbe026d52090c8c4352b636f8235" + dependencies = [ +- "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", ++ "heck", ++ "proc-macro2", ++ "quote", ++ "syn", + ] + + [[package]] + name = "syn" + version = "0.15.34" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe" + dependencies = [ +- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", ++ "quote", ++ "unicode-xid", + ] + + [[package]] + name = "termcolor" + version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" + dependencies = [ +- "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wincolor", + ] + + [[package]] + name = "termion" + version = "1.5.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" + dependencies = [ +- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", +- "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "numtoa", ++ "redox_syscall", ++ "redox_termios", + ] + + [[package]] + name = "textwrap" + version = "0.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" + dependencies = [ +- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width", + ] + + [[package]] + name = "thread_local" + version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" + dependencies = [ +- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", + ] + + [[package]] + name = "time" + version = "0.1.42" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" + dependencies = [ +- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "redox_syscall", ++ "winapi", + ] + + [[package]] + name = "tui" + version = "0.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8896d3a5cb81557cddef234cdeaa2a219d2af5fa9ccbb3cbdfbb52a576feb86f" + dependencies = [ +- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "cassowary", ++ "either", ++ "itertools", ++ "log", ++ "termion", ++ "unicode-segmentation", ++ "unicode-width", + ] + + [[package]] + name = "typenum" + version = "1.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" + + [[package]] + name = "unicode-segmentation" + version = "1.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" + + [[package]] + name = "unicode-width" + version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" + + [[package]] + name = "unicode-xid" + version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" + + [[package]] + name = "uom" +-version = "0.23.1" ++version = "0.30.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e76503e636584f1e10b9b3b9498538279561adcef5412927ba00c2b32c4ce5ed" + dependencies = [ +- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits", ++ "typenum", + ] + +-[[package]] +-name = "void" +-version = "1.0.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +- + [[package]] + name = "winapi" + version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" + dependencies = [ +- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "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 = "wincolor" + version = "0.1.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" + dependencies = [ +- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", + ] +- +-[metadata] +-"checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" +-"checksum battery 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6d6fe5630049e900227cd89afce4c1204b88ec8e61a2581bb96fcce26f047b" +-"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" +-"checksum cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" +-"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" +-"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" +-"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" +-"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" +-"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" +-"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" +-"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" +-"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +-"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" +-"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" +-"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" +-"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" +-"checksum libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "6281b86796ba5e4366000be6e9e18bf35580adf9e63fbe2294aadb587613a319" +-"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" +-"checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" +-"checksum nix 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d10caafde29a846a82ae0af70414e4643e072993441033b2c93217957e2f867" +-"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" +-"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" +-"checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" +-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +-"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" +-"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" +-"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" +-"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" +-"checksum stderrlog 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "61dc66b7ae72b65636dbf36326f9638fb3ba27871bb737a62e2c309b87d91b70" +-"checksum structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c767a8971f53d7324583085deee2e230903be09e52fb27df9af94c5cb2b43c31" +-"checksum structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c57a30c87454ced2186f62f940e981746e8cbbe026d52090c8c4352b636f8235" +-"checksum syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)" = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe" +-"checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" +-"checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" +-"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +-"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +-"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" +-"checksum tui 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8896d3a5cb81557cddef234cdeaa2a219d2af5fa9ccbb3cbdfbb52a576feb86f" +-"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" +-"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" +-"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" +-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +-"checksum uom 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ef5bbe8385736e498dbb0033361f764ab43a435192513861447b9f7714b3fec" +-"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +-"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" +-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +-"checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" +diff --git a/Cargo.toml b/Cargo.toml +index 3d3df77..34b9bc5 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -17,7 +17,7 @@ travis-ci = { repository = "svartalf/rust-battop", branch = "master" } + maintenance = { status = "actively-developed" } + + [dependencies] +-battery = "^0.7" ++battery = "^0.7.7" + structopt = { version = "0.2", default-features = false } + log = "0.4.6" + stderrlog = "0.4.1" diff --git a/third_party/nixpkgs/pkgs/tools/system/battop/default.nix b/third_party/nixpkgs/pkgs/tools/system/battop/default.nix new file mode 100644 index 0000000000..e28789b835 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/battop/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "battop"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "svartalf"; + repo = "rust-battop"; + rev = "v${version}"; + sha256 = "0p53jl3r2p1w9m2fvhzzrj8d9gwpzs22df5sbm7wwja4pxn7ay1w"; + }; + + # https://github.com/svartalf/rust-battop/issues/11 + cargoPatches = [ ./battery.patch ]; + + cargoSha256 = "0ipmnrn6lmf6rqzsqmaxzy9lblrxyrxzkji968356nxxmwzfbfvh"; + + meta = with lib; { + description = "is an interactive battery viewer"; + homepage = "https://github.com/svartalf/rust-battop"; + license = licenses.asl20; + maintainers = with maintainers; [ hdhog ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/system/cron/default.nix b/third_party/nixpkgs/pkgs/tools/system/cron/default.nix index d1b8d2d6af..8f8421781e 100644 --- a/third_party/nixpkgs/pkgs/tools/system/cron/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/cron/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl, vim, sendmailPath ? "/usr/sbin/sendmail"}: -stdenv.mkDerivation { - name = "cron-4.1"; +stdenv.mkDerivation rec { + pname = "cron"; + version = "4.1"; + src = fetchurl { - url = "ftp://ftp.isc.org/isc/cron/cron_4.1.shar"; + url = "ftp://ftp.isc.org/isc/cron/cron_${version}.shar"; sha256 = "16n3dras4b1jh7g958nz1k54pl9pg5fwb3fvjln8z67varvq6if4"; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/dcfldd/default.nix b/third_party/nixpkgs/pkgs/tools/system/dcfldd/default.nix index e5d5026e62..7dc6e1fc12 100644 --- a/third_party/nixpkgs/pkgs/tools/system/dcfldd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/dcfldd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dcfldd-1.3.4-1"; + pname = "dcfldd"; + version = "1.3.4-1"; src = fetchurl { - url = "mirror://sourceforge/dcfldd/${name}.tar.gz"; + url = "mirror://sourceforge/dcfldd/dcfldd-${version}.tar.gz"; sha256 = "1y6mwsvm75f5jzxsjjk0yhf8xnpmz6y8qvcxfandavx59lc3l57m"; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/ddrescue/default.nix b/third_party/nixpkgs/pkgs/tools/system/ddrescue/default.nix index 7e96a4c01f..6191947ac3 100644 --- a/third_party/nixpkgs/pkgs/tools/system/ddrescue/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/ddrescue/default.nix @@ -3,10 +3,11 @@ }: stdenv.mkDerivation rec { - name = "ddrescue-1.25"; + pname = "ddrescue"; + version = "1.25"; src = fetchurl { - url = "mirror://gnu/ddrescue/${name}.tar.lz"; + url = "mirror://gnu/ddrescue/ddrescue-${version}.tar.lz"; sha256 = "0qqh38izl5ppap9a5izf3hijh94k65s3zbfkczd4b7x04syqwlyf"; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/ddrescueview/default.nix b/third_party/nixpkgs/pkgs/tools/system/ddrescueview/default.nix index 6c8e9c56cd..41b28e6fca 100644 --- a/third_party/nixpkgs/pkgs/tools/system/ddrescueview/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/ddrescueview/default.nix @@ -6,7 +6,6 @@ let in stdenv.mkDerivation rec { pname = "ddrescueview"; version = "${versionBase}${versionSuffix}"; - name = "ddrescueview-0.4alpha4"; src = fetchurl { name = "ddrescueview-${versionBase}${versionSuffix}.tar.xz"; diff --git a/third_party/nixpkgs/pkgs/tools/system/dog/default.nix b/third_party/nixpkgs/pkgs/tools/system/dog/default.nix index 94a6b34ff5..4073034a9b 100644 --- a/third_party/nixpkgs/pkgs/tools/system/dog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/dog/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "dog-1.7"; +stdenv.mkDerivation rec { + pname = "dog"; + version = "1.7"; src = fetchurl { - url = "http://archive.debian.org/debian/pool/main/d/dog/dog_1.7.orig.tar.gz"; + url = "http://archive.debian.org/debian/pool/main/d/dog/dog_${version}.orig.tar.gz"; sha256 = "3ef25907ec5d1dfb0df94c9388c020b593fbe162d7aaa9bd08f35d2a125af056"; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/fdisk/default.nix b/third_party/nixpkgs/pkgs/tools/system/fdisk/default.nix index 4ad654783d..e12fedd6ee 100644 --- a/third_party/nixpkgs/pkgs/tools/system/fdisk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/fdisk/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, parted, libuuid, gettext, guile }: stdenv.mkDerivation rec { - name = "gnufdisk-2.0.0a"; # .0a1 seems broken, see https://lists.gnu.org/archive/html/bug-fdisk/2012-09/msg00000.html + pname = "gnufdisk"; + version = "2.0.0a"; # .0a1 seems broken, see https://lists.gnu.org/archive/html/bug-fdisk/2012-09/msg00000.html src = fetchurl { - url = "mirror://gnu/fdisk/${name}.tar.gz"; + url = "mirror://gnu/fdisk/gnufdisk-${version}.tar.gz"; sha256 = "04nd7civ561x2lwcmxhsqbprml3178jfc58fy1v7hzqg5k4nbhy3"; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/gdmap/default.nix b/third_party/nixpkgs/pkgs/tools/system/gdmap/default.nix index d9c639ab1c..5fc242d533 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gdmap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gdmap/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gtk2, pkg-config, libxml2, intltool, gettext }: stdenv.mkDerivation rec { - name = "gdmap-0.8.1"; + pname = "gdmap"; + version = "0.8.1"; src = fetchurl { - url = "mirror://sourceforge/gdmap/${name}.tar.gz"; + url = "mirror://sourceforge/gdmap/gdmap-${version}.tar.gz"; sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052"; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix index 480645f1c9..f0ff4527f7 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.5.0"; + version = "5.6.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cnDYeL1BdxBaCZtK+DnIbtsTVUr3AujA50ttchPX6V0="; + sha256 = "sha256-44PcRUv80IHBZROHk8Ucuo+0Sq60YyT9wGZZL7aVnFM="; }; vendorSha256 = "sha256-9W1K01PJ+tRLSJ0L7NGHXT5w5oHmlBkT8kwnOLOzSCc="; diff --git a/third_party/nixpkgs/pkgs/tools/system/gt5/default.nix b/third_party/nixpkgs/pkgs/tools/system/gt5/default.nix index 374bcf0e31..15b658c991 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gt5/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gt5/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "gt5-1.4.0"; + pname = "gt5"; + version = "1.4.0"; src = fetchurl { - url = "mirror://sourceforge/gt5/${name}.tar.gz"; + url = "mirror://sourceforge/gt5/gt5-${version}.tar.gz"; sha256 = "0gm0gzyp4d9rxqddbaskbz5zvmlhyr4nyb5x9g7x4abyyxqjlnkq"; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix b/third_party/nixpkgs/pkgs/tools/system/htop/default.nix index 25a397bc98..9c254ab33d 100644 --- a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/htop/default.nix @@ -1,7 +1,14 @@ { lib, fetchFromGitHub, stdenv, autoreconfHook -, ncurses, IOKit +, ncurses +, IOKit +, sensorsSupport ? stdenv.isLinux, lm_sensors +, systemdSupport ? stdenv.isLinux, systemd }: +with lib; + +assert systemdSupport -> stdenv.isLinux; + stdenv.mkDerivation rec { pname = "htop"; version = "3.0.5"; @@ -15,10 +22,26 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ncurses - ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; + buildInputs = [ ncurses ] + ++ optional stdenv.isDarwin IOKit + ++ optional sensorsSupport lm_sensors + ++ optional systemdSupport systemd + ; - meta = with lib; { + configureFlags = [ "--enable-unicode" ] + ++ optional sensorsSupport "--with-sensors" + ; + + postFixup = + let + optionalPatch = pred: so: optionalString pred "patchelf --add-needed ${so} $out/bin/htop"; + in + '' + ${optionalPatch sensorsSupport "${lm_sensors}/lib/libsensors.so"} + ${optionalPatch systemdSupport "${systemd}/lib/libsystemd.so"} + ''; + + meta = { description = "An interactive process viewer for Linux"; homepage = "https://htop.dev"; license = licenses.gpl2Only; diff --git a/third_party/nixpkgs/pkgs/tools/system/idle3tools/default.nix b/third_party/nixpkgs/pkgs/tools/system/idle3tools/default.nix index 5e9796396a..f4de055a60 100644 --- a/third_party/nixpkgs/pkgs/tools/system/idle3tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/idle3tools/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "idle3-tools-0.9.1"; +stdenv.mkDerivation rec { + pname = "idle3-tools"; + version = "0.9.1"; src = fetchurl { - url = "mirror://sourceforge/idle3-tools/idle3-tools-0.9.1.tgz"; + url = "mirror://sourceforge/idle3-tools/idle3-tools-${version}.tgz"; sha256 = "00ia7xq9yldxyl9gz0mr4xa568nav14p0fnv82f2rbbkg060cy4p"; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/incron/default.nix b/third_party/nixpkgs/pkgs/tools/system/incron/default.nix index 2df4acba9b..cc986d4535 100644 --- a/third_party/nixpkgs/pkgs/tools/system/incron/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/incron/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchFromGitHub, bash }: stdenv.mkDerivation rec { - name = "incron-0.5.12"; + pname = "incron"; + version = "0.5.12"; src = fetchFromGitHub { owner = "ar-"; repo = "incron"; - rev = name; + rev = "${pname}-${version}"; sha256 = "11d5f98cjafiv9h9zzzrw2s06s2fvdg8gp64km7mdprd2xmy6dih"; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/ipmitool/default.nix b/third_party/nixpkgs/pkgs/tools/system/ipmitool/default.nix index e7d6130ffa..416fab94dd 100644 --- a/third_party/nixpkgs/pkgs/tools/system/ipmitool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/ipmitool/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchurl, openssl, fetchpatch, static ? stdenv.hostPlatform.isStatic }: let - pkgname = "ipmitool"; + pname = "ipmitool"; version = "1.8.18"; in stdenv.mkDerivation { - name = "${pkgname}-${version}"; + inherit pname version; src = fetchurl { - url = "mirror://sourceforge/${pkgname}/${pkgname}-${version}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "0kfh8ny35rvwxwah4yv91a05qwpx74b5slq2lhrh71wz572va93m"; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/loadwatch/default.nix b/third_party/nixpkgs/pkgs/tools/system/loadwatch/default.nix index 80f808214b..722e5a9afd 100644 --- a/third_party/nixpkgs/pkgs/tools/system/loadwatch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/loadwatch/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, ... }: stdenv.mkDerivation { - name = "loadwatch-1.1-1-g6d2544c"; + pname = "loadwatch"; + version = "1.1-1-g6d2544c"; src = fetchgit { url = "git://woffs.de/git/fd/loadwatch.git"; sha256 = "1bhw5ywvhyb6snidsnllfpdi1migy73wg2gchhsfbcpm8aaz9c9b"; diff --git a/third_party/nixpkgs/pkgs/tools/system/localtime/default.nix b/third_party/nixpkgs/pkgs/tools/system/localtime/default.nix index 798e3b3e88..4c12c9eb27 100644 --- a/third_party/nixpkgs/pkgs/tools/system/localtime/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/localtime/default.nix @@ -1,7 +1,8 @@ { lib, fetchFromGitHub, buildGoPackage, m4 }: buildGoPackage rec { - name = "localtime-2017-11-07"; + pname = "localtime"; + version = "2017-11-07"; src = fetchFromGitHub { owner = "Stebalien"; diff --git a/third_party/nixpkgs/pkgs/tools/system/mcron/default.nix b/third_party/nixpkgs/pkgs/tools/system/mcron/default.nix index b8175b5148..485df4231e 100644 --- a/third_party/nixpkgs/pkgs/tools/system/mcron/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/mcron/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, guile, which, ed, libtool }: stdenv.mkDerivation rec { - name = "mcron-1.0.6"; + pname = "mcron"; + version = "1.0.6"; src = fetchurl { - url = "mirror://gnu/mcron/${name}.tar.gz"; + url = "mirror://gnu/mcron/mcron-${version}.tar.gz"; sha256 = "0yvrfzzdy2m7fbqkr61fw01wd9r2jpnbyabxhcsfivgxywknl0fy"; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/monit/default.nix b/third_party/nixpkgs/pkgs/tools/system/monit/default.nix index 8a2a3406c3..9e176677c7 100644 --- a/third_party/nixpkgs/pkgs/tools/system/monit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/monit/default.nix @@ -6,10 +6,11 @@ }: stdenv.mkDerivation rec { - name = "monit-5.27.2"; + pname = "monit"; + version = "5.27.2"; src = fetchurl { - url = "${meta.homepage}dist/${name}.tar.gz"; + url = "${meta.homepage}dist/monit-${version}.tar.gz"; sha256 = "sha256-2ICceNXcHtenujKlpVxRFIVRMsxNpIBfjTqvjPRuqkw="; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/opencl-info/default.nix b/third_party/nixpkgs/pkgs/tools/system/opencl-info/default.nix index d5fd86f231..173de5f607 100644 --- a/third_party/nixpkgs/pkgs/tools/system/opencl-info/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/opencl-info/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, opencl-clhpp, ocl-icd }: stdenv.mkDerivation { - name = "opencl-info-2014-02-21"; + pname = "opencl-info"; + version = "2014-02-21"; src = fetchFromGitHub { owner = "marchv"; diff --git a/third_party/nixpkgs/pkgs/tools/system/pciutils/default.nix b/third_party/nixpkgs/pkgs/tools/system/pciutils/default.nix index 8c017c42d7..95fd4f52c3 100644 --- a/third_party/nixpkgs/pkgs/tools/system/pciutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/pciutils/default.nix @@ -5,10 +5,11 @@ }: stdenv.mkDerivation rec { - name = "pciutils-3.7.0"; # with release-date database + pname = "pciutils"; + version = "3.7.0"; # with release-date database src = fetchurl { - url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz"; + url = "mirror://kernel/software/utils/pciutils/pciutils-${version}.tar.xz"; sha256 = "1ss0rnfsx8gvqjxaji4mvbhf9xyih4cadmgadbwwv8mnx1xvjh4x"; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix b/third_party/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix index 9afb1933e1..685697f861 100644 --- a/third_party/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "rowhammer-test-20150811"; + pname = "rowhammer-test"; + version = "20150811"; src = fetchFromGitHub { owner = "google"; diff --git a/third_party/nixpkgs/pkgs/tools/system/s6-rc/default.nix b/third_party/nixpkgs/pkgs/tools/system/s6-rc/default.nix index 532575d16c..31b9c14257 100644 --- a/third_party/nixpkgs/pkgs/tools/system/s6-rc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/s6-rc/default.nix @@ -1,4 +1,4 @@ -{ lib, skawarePackages }: +{ lib, stdenv, skawarePackages, targetPackages }: with skawarePackages; @@ -8,7 +8,7 @@ buildPackage { sha256 = "12bzc483jpd16xmhfsfrib84daj1k3kwy5s5nc18ap60apa1r39a"; description = "A service manager for s6-based systems"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; outputs = [ "bin" "lib" "dev" "doc" "out" ]; @@ -30,6 +30,25 @@ buildPackage { "--with-dynlib=${s6.out}/lib" ]; + # s6-rc-compile generates built-in service definitions containing + # absolute paths to execline, s6, and s6-rc programs. If we're + # running s6-rc-compile as part of a Nix derivation, and we want to + # cross-compile that derivation, those paths will be wrong -- + # they'll be for execline, s6, and s6-rc on the platform we're + # running s6-rc-compile on, not the platform we're targeting. + # + # We can detect this special case of s6-rc being used at build time + # in a derivation that's being cross-compiled, because that's the + # only time hostPlatform != targetPlatform. When that happens we + # modify s6-rc-compile to use the configuration headers for the + # system we're cross-compiling for. + postConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) '' + substituteInPlace src/s6-rc/s6-rc-compile.c \ + --replace '' '"${targetPackages.execline.dev}/include/execline/config.h"' \ + --replace '' '"${targetPackages.s6.dev}/include/s6/config.h"' \ + --replace '' '"${targetPackages.s6-rc.dev}/include/s6-rc/config.h"' + ''; + postInstall = '' # remove all s6 executables from build directory rm $(find -name "s6-rc-*" -type f -mindepth 1 -maxdepth 1 -executable) diff --git a/third_party/nixpkgs/pkgs/tools/system/safecopy/default.nix b/third_party/nixpkgs/pkgs/tools/system/safecopy/default.nix index 5533c9a57f..1c0bedff47 100644 --- a/third_party/nixpkgs/pkgs/tools/system/safecopy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/safecopy/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "safecopy-1.7"; + pname = "safecopy"; + version = "1.7"; src = fetchurl { - url = "mirror://sourceforge/project/safecopy/safecopy/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/project/safecopy/safecopy/safecopy-${version}/safecopy-${version}.tar.gz"; sha256 = "1zf4kk9r8za9pn4hzy1y3j02vrhl1rxfk5adyfq0w0k48xfyvys2"; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/sg3_utils/default.nix b/third_party/nixpkgs/pkgs/tools/system/sg3_utils/default.nix index c3f698576d..8d867c76e1 100644 --- a/third_party/nixpkgs/pkgs/tools/system/sg3_utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/sg3_utils/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { version = "1.46r862"; src = fetchurl { - url = "http://sg.danny.cz/sg/p/sg3_utils-${version}.tgz"; - sha256 = "sha256-s2UmU+p3s7Hoe+GFri2q+/3XLBICc+h04cxM86yaAs8="; + url = "https://sg.danny.cz/sg/p/sg3_utils-${version}.tgz"; + sha256 = "s2UmU+p3s7Hoe+GFri2q+/3XLBICc+h04cxM86yaAs8="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix b/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix index 4d2ca81183..312c31d671 100644 --- a/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "thermald"; - version = "2.4.3"; + version = "2.4.6"; outputs = [ "out" "devdoc" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "sha256-CPrk2r3C4WG+y3KzWf6xWhfNdDgEigki62iAXu+DccU="; + sha256 = "sha256-ZknZznoYVX3dNBIUvER6odv5eNrCV3//CXH1ypCf6tE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/system/throttled/default.nix b/third_party/nixpkgs/pkgs/tools/system/throttled/default.nix index 9b92635d1d..2729a16b86 100644 --- a/third_party/nixpkgs/pkgs/tools/system/throttled/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/throttled/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "throttled"; - version = "0.8"; + version = "0.9.2"; src = fetchFromGitHub { owner = "erpalma"; repo = pname; rev = "v${version}"; - sha256 = "0qw124gdgjqij3xhgg8j1mdsg6j0xg340as5qf8hd3gwc38sqi9x"; + sha256 = "sha256-4aDa6REDHO7gr1czIv6NlepeMVJI93agxJjE2vHiEmk="; }; nativeBuildInputs = [ python3Packages.wrapPython ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix b/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix index b7eb00ee59..fd746ca117 100644 --- a/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix @@ -19,10 +19,11 @@ let inherit (lib) optional; in stdenv.mkDerivation rec { - name = "gawk-5.1.0"; + pname = "gawk"; + version = "5.1.0"; src = fetchurl { - url = "mirror://gnu/gawk/${name}.tar.xz"; + url = "mirror://gnu/gawk/gawk-${version}.tar.xz"; sha256 = "1gc2cccqy1x1bf6rhwlmd8q7dz7gnam6nwgl38bxapv6qm5flpyg"; }; diff --git a/third_party/nixpkgs/pkgs/tools/text/gnupatch/default.nix b/third_party/nixpkgs/pkgs/tools/text/gnupatch/default.nix index 97d3136e7e..8d8fa7d0a8 100644 --- a/third_party/nixpkgs/pkgs/tools/text/gnupatch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/gnupatch/default.nix @@ -3,10 +3,11 @@ }: stdenv.mkDerivation rec { - name = "patch-2.7.6"; + pname = "patch"; + version = "2.7.6"; src = fetchurl { - url = "mirror://gnu/patch/${name}.tar.xz"; + url = "mirror://gnu/patch/patch-${version}.tar.xz"; sha256 = "1zfqy4rdcy279vwn2z1kbv19dcfw25d2aqy9nzvdkq5bjzd0nqdc"; }; diff --git a/third_party/nixpkgs/pkgs/tools/text/hck/default.nix b/third_party/nixpkgs/pkgs/tools/text/hck/default.nix new file mode 100644 index 0000000000..f10c01ca2f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/hck/default.nix @@ -0,0 +1,23 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "hck"; + version = "0.5.4"; + + src = fetchFromGitHub { + owner = "sstadick"; + repo = pname; + rev = "v${version}"; + sha256 = "1zdzi98qywlwk5bp47963vya2p2ahrbjkc9h63lmb05wlas9s78y"; + }; + + cargoSha256 = "0lvd5xpgh2vq2lszzb0fs6ha2vb419a5w0hlkq3287vq3ya3p4qg"; + + meta = with lib; { + description = "A close to drop in replacement for cut that can use a regex delimiter instead of a fixed string"; + homepage = "https://github.com/sstadick/hck"; + changelog = "https://github.com/sstadick/hck/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ mit /* or */ unlicense ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/hottext/default.nix b/third_party/nixpkgs/pkgs/tools/text/hottext/default.nix index 2e9d0a909a..ca0cbf9d1a 100644 --- a/third_party/nixpkgs/pkgs/tools/text/hottext/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/hottext/default.nix @@ -55,11 +55,11 @@ let in stdenv.mkDerivation rec { pname = "hottext"; - version = "1.3"; + version = "1.4"; src = fetchurl { url = "https://git.sr.ht/~ehmry/hottext/archive/v${version}.tar.gz"; - sha256 = "sha256-iz7Z2x0/yi/E6gGFkYgq/yZDOxrZGwQmumPoO9kckLQ="; + sha256 = "sha256-hIUofi81zowSMbt1lUsxCnVzfJGN3FEiTtN8CEFpwzY="; }; nativeBuildInputs = [ nim ]; diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 2790610e51..50c2a23bb4 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -183,6 +183,14 @@ mapAliases ({ deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31 deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05 deltachat-electron = deltachat-desktop; # added 2021-07-18 + deluge-1_x = throw '' + Deluge 1.x (deluge-1_x) is no longer supported. + Please use Deluge 2.x (deluge-2_x) instead, for example: + + services.deluge.package = pkgs.deluge-2_x; + + Note that it is NOT possible to switch back to Deluge 1.x after this change. + ''; # added 2021-08-18 desktop_file_utils = desktop-file-utils; # added 2018-02-25 devicemapper = lvm2; # added 2018-04-25 digikam5 = digikam; # added 2017-02-18 @@ -553,6 +561,7 @@ mapAliases ({ olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05 opencl-icd = ocl-icd; # added 2017-01-20 openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21 + openelec-dvb-firmware = libreelec-dvb-firmware; # added 2021-05-10 openexr_ctl = ctl; # added 2018-04-25 openisns = open-isns; # added 2020-01-28 openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 43ecc12882..30db04579b 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -971,8 +971,6 @@ 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 { }; @@ -1478,7 +1476,7 @@ with pkgs; deskew = callPackage ../applications/graphics/deskew { }; - detect-secrets = python3Packages.callPackage ../development/tools/detect-secrets { }; + detect-secrets = with python3Packages; toPythonApplication detect-secrets; dfmt = callPackage ../tools/text/dfmt { }; @@ -2182,6 +2180,8 @@ with pkgs; traefik = callPackage ../servers/traefik { }; + traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { }; + calamares = libsForQt514.callPackage ../tools/misc/calamares { python = python3; boost = pkgs.boost.override { python = python3; }; @@ -3703,6 +3703,8 @@ with pkgs; cicero-tui = callPackage ../tools/misc/cicero-tui { }; + cilium-cli = callPackage ../applications/networking/cluster/cilium { }; + cipherscan = callPackage ../tools/security/cipherscan { openssl = if stdenv.hostPlatform.system == "x86_64-linux" then openssl-chacha @@ -4199,10 +4201,6 @@ with pkgs; pythonPackages = python3Packages; libtorrent-rasterbar = libtorrent-rasterbar-1_2_x.override { python = python3; }; }; - deluge-1_x = callPackage ../applications/networking/p2p/deluge/1.nix { - pythonPackages = python2Packages; - libtorrent-rasterbar = libtorrent-rasterbar-1_1_x; - }; deluge = deluge-2_x; desktop-file-utils = callPackage ../tools/misc/desktop-file-utils { }; @@ -4258,7 +4256,7 @@ with pkgs; }; diffoscope = diffoscopeMinimal.override { - enableBloat = true; + enableBloat = !stdenv.isDarwin; }; diffr = callPackage ../tools/text/diffr { @@ -4454,6 +4452,8 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; + emote = callPackage ../tools/inputmethods/emote { }; + engauge-digitizer = libsForQt5.callPackage ../applications/science/math/engauge-digitizer { }; epubcheck = callPackage ../tools/text/epubcheck { }; @@ -4914,7 +4914,9 @@ with pkgs; libbtbb = callPackage ../development/libraries/libbtbb { }; - lp_solve = callPackage ../applications/science/math/lp_solve { }; + lp_solve = callPackage ../applications/science/math/lp_solve { + inherit (darwin) cctools; + }; fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { }; @@ -5047,6 +5049,8 @@ with pkgs; ftop = callPackage ../os-specific/linux/ftop { }; + ftxui = callPackage ../development/libraries/ftxui { }; + fsarchiver = callPackage ../tools/archivers/fsarchiver { }; fsfs = callPackage ../tools/filesystems/fsfs { }; @@ -7332,10 +7336,12 @@ with pkgs; netatalk = callPackage ../tools/filesystems/netatalk { }; - netcdf = callPackage ../development/libraries/netcdf { }; + netcdf = callPackage ../development/libraries/netcdf { + hdf5 = hdf5.override { usev110Api = true; }; + }; netcdf-mpi = appendToName "mpi" (netcdf.override { - hdf5 = hdf5-mpi; + hdf5 = hdf5-mpi.override { usev110Api = true; }; }); netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { }; @@ -7687,8 +7693,12 @@ with pkgs; onioncircuits = callPackage ../tools/security/onioncircuits { }; + onlykey-agent = callPackage ../tools/security/onlykey-agent { }; + onlykey-cli = callPackage ../tools/security/onlykey-cli { }; + onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; }; + openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; }; openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { jre = pkgs.jre_headless; }; @@ -7972,6 +7982,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit; }; + otpauth = callPackage ../tools/security/otpauth { }; + pcsclite = callPackage ../tools/security/pcsclite { inherit (darwin.apple_sdk.frameworks) IOKit; }; @@ -8025,6 +8037,8 @@ with pkgs; peco = callPackage ../tools/text/peco { }; + pg_activity = callPackage ../development/tools/database/pg_activity { }; + pg_checksums = callPackage ../development/tools/database/pg_checksums { }; pg_flame = callPackage ../tools/misc/pg_flame { }; @@ -8547,6 +8561,8 @@ with pkgs; inherit (callPackage ../development/misc/resholve { }) resholve resholvePackage; + restool = callPackage ../os-specific/linux/restool {}; + reuse = callPackage ../tools/package-management/reuse { }; rewritefs = callPackage ../os-specific/linux/rewritefs { }; @@ -9298,6 +9314,8 @@ with pkgs; znapzend = callPackage ../tools/backup/znapzend { }; + tar2ext4 = callPackage ../tools/filesystems/tar2ext4 { }; + targetcli = callPackage ../os-specific/linux/targetcli { }; target-isns = callPackage ../os-specific/linux/target-isns { }; @@ -9322,6 +9340,8 @@ with pkgs; tboot = callPackage ../tools/security/tboot { }; + tagutil = callPackage ../applications/audio/tagutil { }; + tcpdump = callPackage ../tools/networking/tcpdump { }; tcpflow = callPackage ../tools/networking/tcpflow { }; @@ -11489,13 +11509,6 @@ with pkgs; glslang = callPackage ../development/compilers/glslang { }; - go_1_14 = callPackage ../development/compilers/go/1.14.nix ({ - inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { - stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; - }); - go_1_15 = callPackage ../development/compilers/go/1.15.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { @@ -12542,6 +12555,10 @@ with pkgs; clisp = callPackage ../development/interpreters/clisp { }; clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { }; + clojupyter = callPackage ../applications/editors/jupyter-kernels/clojupyter { + jre = jre8; + }; + clojure = callPackage ../development/interpreters/clojure { # set this to an LTS version of java jdk = jdk11; @@ -12661,7 +12678,7 @@ with pkgs; ### LUA interpreters luaInterpreters = callPackage ./../development/interpreters/lua-5 {}; - inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_2_1 luajit_2_0; + inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_openresty luajit_2_1 luajit_2_0; lua5 = lua5_2_compat; lua = lua5; @@ -12852,6 +12869,8 @@ with pkgs; pypi2nix = callPackage ../development/tools/pypi2nix {}; + pypi-mirror = callPackage ../development/tools/pypi-mirror {}; + setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix {}; # These pyside tools do not provide any Python modules and are meant to be here. @@ -13746,6 +13765,8 @@ with pkgs; foreman = callPackage ../tools/system/foreman { }; goreman = callPackage ../tools/system/goreman { }; + fprettify = callPackage ../development/tools/fprettify { }; + framac = callPackage ../development/tools/analysis/frama-c { }; frame = callPackage ../development/libraries/frame { }; @@ -13990,6 +14011,8 @@ with pkgs; ko = callPackage ../development/tools/ko { }; + konstraint = callPackage ../development/tools/konstraint { }; + krankerl = callPackage ../development/tools/krankerl { }; krew = callPackage ../development/tools/krew { }; @@ -14909,7 +14932,6 @@ with pkgs; boost169 = callPackage ../development/libraries/boost/1.69.nix { }; boost16x = boost169; boost170 = callPackage ../development/libraries/boost/1.70.nix { }; - boost171 = callPackage ../development/libraries/boost/1.71.nix { }; boost172 = callPackage ../development/libraries/boost/1.72.nix { }; boost173 = callPackage ../development/libraries/boost/1.73.nix { }; boost174 = callPackage ../development/libraries/boost/1.74.nix { }; @@ -16752,6 +16774,8 @@ with pkgs; libechonest = callPackage ../development/libraries/libechonest { }; + libemf2svg = callPackage ../development/libraries/libemf2svg { }; + libev = callPackage ../development/libraries/libev { }; libevent = callPackage ../development/libraries/libevent { }; @@ -17479,6 +17503,8 @@ with pkgs; libvisio = callPackage ../development/libraries/libvisio { }; + libvisio2svg = callPackage ../development/libraries/libvisio2svg { }; + libvisual = callPackage ../development/libraries/libvisual { }; libvmaf = callPackage ../development/libraries/libvmaf { }; @@ -18005,7 +18031,11 @@ with pkgs; opencv = opencv4; - openexr = callPackage ../development/libraries/openexr { }; + imath = callPackage ../development/libraries/imath { }; + + openexr = openexr_2; + openexr_2 = callPackage ../development/libraries/openexr { }; + openexr_3 = callPackage ../development/libraries/openexr/3.nix { }; openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; @@ -18286,45 +18316,27 @@ with pkgs; (import ../development/libraries/qt-5/5.12) { inherit newScope; inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; - inherit bison; - inherit cups; - inherit dconf; - inherit harfbuzz; - inherit libGL; - inherit perl; - inherit gtk3; + inherit bison cups dconf harfbuzz libGL perl gtk3; inherit (gst_all_1) gstreamer gst-plugins-base; - inherit llvmPackages_5; + inherit llvmPackages_5 darwin; }); qt514 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.14) { inherit newScope; inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; - inherit bison; - inherit cups; - inherit dconf; - inherit harfbuzz; - inherit libGL; - inherit perl; - inherit gtk3; + inherit bison cups dconf harfbuzz libGL perl gtk3; inherit (gst_all_1) gstreamer gst-plugins-base; - inherit llvmPackages_5; + inherit llvmPackages_5 darwin; }); qt515 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.15) { inherit newScope; inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper; - inherit bison; - inherit cups; - inherit dconf; - inherit harfbuzz; - inherit libGL; - inherit perl; - inherit gtk3; + inherit bison cups dconf harfbuzz libGL perl gtk3; inherit (gst_all_1) gstreamer gst-plugins-base; - inherit llvmPackages_5; + inherit llvmPackages_5 darwin; }); libsForQt512 = recurseIntoAttrs (import ./qt5-packages.nix { @@ -19422,9 +19434,6 @@ with pkgs; ### DEVELOPMENT / GO MODULES - buildGo114Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_14; - }; buildGo115Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_15; }; @@ -19434,9 +19443,6 @@ with pkgs; buildGoPackage = buildGo116Package; - buildGo114Module = callPackage ../development/go-modules/generic { - go = buildPackages.go_1_14; - }; buildGo115Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_15; }; @@ -20233,7 +20239,7 @@ with pkgs; }; mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { - inherit (darwin) cctools developer_cmds; + inherit (darwin) cctools developer_cmds DarwinTools; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost173; # Configure checks for specific version. protobuf = protobuf3_11; @@ -20442,6 +20448,8 @@ with pkgs; rake = callPackage ../development/tools/build-managers/rake { }; + rakkess = callPackage ../development/tools/rakkess { }; + redis = callPackage ../servers/nosql/redis { }; redstore = callPackage ../servers/http/redstore { }; @@ -20470,6 +20478,8 @@ with pkgs; roon-bridge = callPackage ../servers/roon-bridge { }; + rpiplay = callPackage ../servers/rpiplay { }; + roon-server = callPackage ../servers/roon-server { }; s6 = skawarePackages.s6; @@ -21063,7 +21073,7 @@ with pkgs; linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; - openelec-dvb-firmware = callPackage ../os-specific/linux/firmware/openelec-dvb-firmware { }; + libreelec-dvb-firmware = callPackage ../os-specific/linux/firmware/libreelec-dvb-firmware { }; openiscsi = callPackage ../os-specific/linux/open-iscsi { }; @@ -23318,6 +23328,8 @@ with pkgs; anup = callPackage ../applications/misc/anup {}; + anytype = callPackage ../applications/misc/anytype { }; + ao = libfive; apache-directory-studio = callPackage ../applications/networking/apache-directory-studio {}; @@ -26074,7 +26086,10 @@ with pkgs; mpc123 = callPackage ../applications/audio/mpc123 { }; - mpg123 = callPackage ../applications/audio/mpg123 { }; + mpg123 = callPackage ../applications/audio/mpg123 { + inherit (darwin.apple_sdk.frameworks) AudioUnit AudioToolbox; + jack = libjack2; + }; mpg321 = callPackage ../applications/audio/mpg321 { }; @@ -27985,31 +28000,11 @@ with pkgs; wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); neovim-unwrapped = callPackage ../applications/editors/neovim { - # neovim doesn't build with luajit on aarch64-darwin : - # ./luarocks init - # PANIC: unprotected error in call to Lua API (module 'luarocks.core.hardcoded' not found: - # no field package.preload['luarocks.core.hardcoded'] - # no file '/private/tmp/nix-build-luarocks-3.2.1.drv-0/source/src/luarocks/core/hardcoded.lua' - # no file './luarocks/core/hardcoded.lua' - # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/luajit-2.1.0-beta3/luarocks/core/hardcoded.lua' - # no file '/usr/local/share/lua/5.1/luarocks/core/hardcoded.lua' - # no file '/usr/local/share/lua/5.1/luarocks/core/hardcoded/init.lua' - # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/lua/5.1/luarocks/core/hardcoded.lua' - # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/lua/5.1/luarocks/core/hardcoded/init.lua' - # no file './luarocks/core/hardcoded.so' - # no file '/usr/local/lib/lua/5.1/luarocks/core/hardcoded.so' - # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/lib/lua/5.1/luarocks/core/hardcoded.so' - # no file '/usr/local/lib/lua/5.1/loadall.so' - # no file './luarocks.so' - # no file '/usr/local/lib/lua/5.1/luarocks.so' - # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/lib/lua/5.1/luarocks.so' - # no file '/usr/local/lib/lua/5.1/loadall.so') - # make: *** [GNUmakefile:57: luarocks] Error 1 - # - # See https://github.com/NixOS/nixpkgs/issues/129099 - # Possibly related: https://github.com/neovim/neovim/issues/7879 + # See: + # - https://github.com/NixOS/nixpkgs/issues/129099 + # - https://github.com/NixOS/nixpkgs/issues/128959 lua = - if (stdenv.isDarwin && stdenv.isAarch64) then lua5_1 else + if (stdenv.isDarwin && stdenv.isAarch64) then luajit_openresty else luajit; }; @@ -30962,6 +30957,8 @@ with pkgs; openems = callPackage ../applications/science/electronics/openems { }; + openroad = libsForQt5.callPackage ../applications/science/electronics/openroad { }; + pcb = callPackage ../applications/science/electronics/pcb { }; qucs = callPackage ../applications/science/electronics/qucs { }; @@ -31460,6 +31457,8 @@ with pkgs; hatari = callPackage ../misc/emulators/hatari { }; + hck = callPackage ../tools/text/hck { }; + helm = callPackage ../applications/audio/helm { }; helmfile = callPackage ../applications/networking/cluster/helmfile { }; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 4361f2eccd..eed731fcae 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -16905,12 +16905,32 @@ let sha256 = "2ad194f91ef24df4698369c2562d4164e9bf74f2d5565c681841abf79789ed82"; }; buildInputs = [ TestDeep ]; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = [ BKeywords ConfigTiny FileWhich ListMoreUtils ModulePluggable PPIxQuoteLike PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ]; meta = { homepage = "http://perlcritic.com"; description = "Critique Perl source code for best-practices"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/perlcritic + ''; + }; + + PerlCriticCommunity = buildPerlModule { + pname = "Perl-Critic-Community"; + version = "1.0.0"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DB/DBOOK/Perl-Critic-Community-v1.0.0.tar.gz"; + sha256 = "311b775da4193e9de94cf5225e993cc54dd096ae1e7ef60738cdae1d9b8854e7"; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ PPI PathTiny PerlCritic PerlCriticPolicyVariablesProhibitLoopOnHash PerlCriticPulp ]; + meta = { + homepage = "https://github.com/Grinnz/Perl-Critic-Community"; + description = "Community-inspired Perl::Critic policies"; + license = lib.licenses.artistic2; + }; }; PerlCriticMoose = buildPerlPackage rec { @@ -16927,6 +16947,35 @@ let }; }; + PerlCriticPolicyVariablesProhibitLoopOnHash = buildPerlPackage { + pname = "Perl-Critic-Policy-Variables-ProhibitLoopOnHash"; + version = "0.008"; + src = fetchurl { + url = "mirror://cpan/authors/id/X/XS/XSAWYERX/Perl-Critic-Policy-Variables-ProhibitLoopOnHash-0.008.tar.gz"; + sha256 = "12f5f0be96ea1bdc7828058577bd1c5c63ca23c17fac9c3709452b3dff5b84e0"; + }; + propagatedBuildInputs = [ PerlCritic ]; + meta = { + description = "Don't write loops on hashes, only on keys and values of hashes"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + PerlCriticPulp = buildPerlPackage { + pname = "Perl-Critic-Pulp"; + version = "99"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KR/KRYDE/Perl-Critic-Pulp-99.tar.gz"; + sha256 = "b8fda842fcbed74d210257c0a284b6dc7b1d0554a47a3de5d97e7d542e23e7fe"; + }; + propagatedBuildInputs = [ IOString ListMoreUtils PPI PerlCritic PodMinimumVersion ]; + meta = { + homepage = "http://user42.tuxfamily.org/perl-critic-pulp/index.html"; + description = "Some add-on policies for Perl::Critic"; + license = lib.licenses.gpl3Plus; + }; + }; + PerlDestructLevel = buildPerlPackage { pname = "Perl-Destruct-Level"; version = "0.02"; @@ -17305,6 +17354,21 @@ let Po4a = callPackage ../development/perl-modules/Po4a { }; + PodMinimumVersion = buildPerlPackage { + pname = "Pod-MinimumVersion"; + version = "50"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KR/KRYDE/Pod-MinimumVersion-50.tar.gz"; + sha256 = "0bd2812d9aacbd99bb71fa103a4bb129e955c138ba7598734207dc9fb67b5a6f"; + }; + propagatedBuildInputs = [ IOString PodParser ]; + meta = { + homepage = "http://user42.tuxfamily.org/pod-minimumversion/index.html"; + description = "Determine minimum Perl version of POD directives"; + license = lib.licenses.free; + }; + }; + POE = buildPerlPackage { pname = "POE"; version = "1.368"; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 38a487cfcc..431d4a9959 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -1539,6 +1539,8 @@ in { cloudsmith-api = callPackage ../development/python-modules/cloudsmith-api { }; + cloudsplaining = callPackage ../development/python-modules/cloudsplaining { }; + clustershell = callPackage ../development/python-modules/clustershell { }; clvm = callPackage ../development/python-modules/clvm { }; @@ -1930,6 +1932,8 @@ in { desktop-notifier = callPackage ../development/python-modules/desktop-notifier { }; + detect-secrets = callPackage ../development/python-modules/detect-secrets { }; + devolo-home-control-api = callPackage ../development/python-modules/devolo-home-control-api { }; devpi-common = callPackage ../development/python-modules/devpi-common { }; @@ -2161,6 +2165,8 @@ in { docopt = callPackage ../development/python-modules/docopt { }; + docopt-ng = callPackage ../development/python-modules/docopt-ng { }; + docplex = callPackage ../development/python-modules/docplex { }; docrep = callPackage ../development/python-modules/docrep { }; @@ -3206,6 +3212,8 @@ in { guestfs = callPackage ../development/python-modules/guestfs { }; + gudhi = callPackage ../development/python-modules/gudhi { }; + gumath = callPackage ../development/python-modules/gumath { }; gunicorn = callPackage ../development/python-modules/gunicorn { }; @@ -3730,6 +3738,8 @@ in { jinja2 = callPackage ../development/python-modules/jinja2 { }; + jinja2-git = callPackage ../development/python-modules/jinja2-git { }; + jinja2_pluralize = callPackage ../development/python-modules/jinja2_pluralize { }; jinja2_time = callPackage ../development/python-modules/jinja2_time { }; @@ -5009,6 +5019,8 @@ in { onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { }; + onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; + onnx = callPackage ../development/python-modules/onnx { }; open-garage = callPackage ../development/python-modules/open-garage { }; @@ -5484,6 +5496,8 @@ in { plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy { }; + platformdirs = callPackage ../development/python-modules/platformdirs { }; + playsound = callPackage ../development/python-modules/playsound { }; plexapi = callPackage ../development/python-modules/plexapi { }; @@ -5534,6 +5548,10 @@ in { polib = callPackage ../development/python-modules/polib { }; + policy-sentry = callPackage ../development/python-modules/policy-sentry { }; + + policyuniverse = callPackage ../development/python-modules/policyuniverse { }; + polyline = callPackage ../development/python-modules/polyline { }; pomegranate = callPackage ../development/python-modules/pomegranate { }; @@ -5565,6 +5583,8 @@ in { postorius = callPackage ../servers/mail/mailman/postorius.nix { }; + pot = callPackage ../development/python-modules/pot { }; + potr = callPackage ../development/python-modules/potr { }; power = callPackage ../development/python-modules/power { }; @@ -6061,7 +6081,9 @@ in { pygal = callPackage ../development/python-modules/pygal { }; - pygame = callPackage ../development/python-modules/pygame { }; + pygame = callPackage ../development/python-modules/pygame { + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit CoreMIDI; + }; pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; @@ -6265,6 +6287,8 @@ in { pymaging_png = callPackage ../development/python-modules/pymaging_png { }; + pymanopt = callPackage ../development/python-modules/pymanopt { }; + pymata-express = callPackage ../development/python-modules/pymata-express { }; pymatgen = callPackage ../development/python-modules/pymatgen { }; diff --git a/third_party/nixpkgs/pkgs/top-level/stage.nix b/third_party/nixpkgs/pkgs/top-level/stage.nix index dc43bbec9d..b01ef584d2 100644 --- a/third_party/nixpkgs/pkgs/top-level/stage.nix +++ b/third_party/nixpkgs/pkgs/top-level/stage.nix @@ -65,7 +65,12 @@ let stdenvAdapters = self: super: - let res = import ../stdenv/adapters.nix self; in res // { + let + res = import ../stdenv/adapters.nix { + inherit lib config; + pkgs = self; + }; + in res // { stdenvAdapters = res; }; diff --git a/third_party/nixpkgs/pkgs/top-level/static.nix b/third_party/nixpkgs/pkgs/top-level/static.nix index 0c9af250e8..73d8d9e530 100644 --- a/third_party/nixpkgs/pkgs/top-level/static.nix +++ b/third_party/nixpkgs/pkgs/top-level/static.nix @@ -35,9 +35,6 @@ self: super: let }; staticAdapters = - # makeStaticDarwin must go first so that the extraBuildInputs - # override does not recreate mkDerivation, removing subsequent - # adapters. optional super.stdenv.hostPlatform.isDarwin makeStaticDarwin ++ [ makeStaticLibraries propagateBuildInputs ] @@ -80,30 +77,9 @@ self: super: let }); }; - llvmStaticAdapter = llvmPackages: - llvmPackages // { - stdenv = foldl (flip id) llvmPackages.stdenv staticAdapters; - libcxxStdenv = foldl (flip id) llvmPackages.libcxxStdenv staticAdapters; - }; - in { stdenv = foldl (flip id) super.stdenv staticAdapters; - gcc49Stdenv = foldl (flip id) super.gcc49Stdenv staticAdapters; - gcc6Stdenv = foldl (flip id) super.gcc6Stdenv staticAdapters; - gcc7Stdenv = foldl (flip id) super.gcc7Stdenv staticAdapters; - gcc8Stdenv = foldl (flip id) super.gcc8Stdenv staticAdapters; - gcc9Stdenv = foldl (flip id) super.gcc9Stdenv staticAdapters; - - llvmPackages_5 = llvmStaticAdapter super.llvmPackages_5; - llvmPackages_6 = llvmStaticAdapter super.llvmPackages_6; - llvmPackages_7 = llvmStaticAdapter super.llvmPackages_7; - llvmPackages_8 = llvmStaticAdapter super.llvmPackages_8; - llvmPackages_9 = llvmStaticAdapter super.llvmPackages_9; - llvmPackages_10 = llvmStaticAdapter super.llvmPackages_10; - llvmPackages_11 = llvmStaticAdapter super.llvmPackages_11; - llvmPackages_12 = llvmStaticAdapter super.llvmPackages_12; - boost = super.boost.override { # Don’t use new stdenv for boost because it doesn’t like the # --disable-shared flag